Revision: 1512
http://csipc2.svn.sourceforge.net/csipc2/?rev=1512&view=rev
Author: elmar_weber
Date: 2008-05-27 13:28:20 -0700 (Tue, 27 May 2008)
Log Message:
-----------
applied patch from replaced SVN repository
Author: warcamel
Date: 2008-05-27 04:04:22 -0700 (Tue, 27 May 2008)
Log Message:
-----------
- fixed BUG in Makefile using gtk libraries. BUG appeared in Ubuntu/hardy as gtk/gtk.h was not found anymore. Might have been an autotools/automake problem.
Modified Paths:
--------------
trunk/src/tests/ccd_connection/Makefile.am
Modified: trunk/src/tests/ccd_connection/Makefile.am
===================================================================
--- trunk/src/tests/ccd_connection/Makefile.am 2008-05-27 19:04:07 UTC (rev 1511)
+++ trunk/src/tests/ccd_connection/Makefile.am 2008-05-27 20:28:20 UTC (rev 1512)
@@ -5,30 +5,29 @@
# Date : 10.03.2008
#
-SUBDIRS = man1
+CC = @mpicc@
+if MAKE_GTK_SUPPORT
+# With GTK build GUI
+
+INCLUDES = @GTK2_INCS@ @GLOBAL_INCLUDE@
+LDADD = @MATCHING_LIBS@ @SHARED_LIBS@ @GTK2_LIBS@
+bin_PROGRAMS = ccd_connection ccd_connection_gui
+
+ccd_connection_gui_DEPENDENCIES = ${LDADD}
+ccd_connection_gui_SOURCES = ccd_connection_gui.c \
+ ccd_connection_funcs.c
+else
+# Without GTK
+
INCLUDES = @GLOBAL_INCLUDE@
LDADD = @MATCHING_LIBS@ @SHARED_LIBS@
-CC = @mpicc@
+bin_PROGRAMS = ccd_connection
-if MAKE_GTK_SUPPORT
-gtk_bins = ccd_connection_gui
endif
-bin_PROGRAMS = ccd_connection ${gtk_bins}
ccd_connection_DEPENDENCIES = ${LDADD}
ccd_connection_SOURCES = ccd_connection.c \
- ccd_connection_funcs.h \
ccd_connection_funcs.c
-if MAKE_GTK_SUPPORT
-ccd_connection_gui_DEPENDENCIES = ${LDADD}
-ccd_connection_gui_LDADD = ${LDADD} @GTK2_LIBS@
-ccd_connection_gui_CFLAGS = @GTK2_INCS@
-ccd_connection_gui_SOURCES = ccd_connection_gui.c \
- ccd_connection_funcs.h \
- ccd_connection_funcs.c \
- ccd_connection_gui_funcs.h \
- ccd_connection_gui_funcs.c
-endif
-
+man_MANS = man1/ccd_connection.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
