[csipc2-commits] SF.net SVN: csipc2: [1315] trunk/src/tests/ccd_connection/Makefile.am

[<csi...@li...>]

Revision: 1315
          http://csipc2.svn.sourceforge.net/csipc2/?rev=1315&view=rev
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-26 13:30:46 UTC (rev 1314)
+++ trunk/src/tests/ccd_connection/Makefile.am	2008-05-27 11:04:22 UTC (rev 1315)
@@ -18,25 +18,29 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-INCLUDES              = @GLOBAL_INCLUDE@
-LDADD                 = @MATCHING_LIBS@ @SHARED_LIBS@
 CC                    = @mpicc@
 
 if MAKE_GTK_SUPPORT
-gtk_bins              = ccd_connection_gui
-endif
-bin_PROGRAMS          = ccd_connection ${gtk_bins}
+# With GTK build GUI
 
-ccd_connection_DEPENDENCIES     = ${LDADD}
-ccd_connection_SOURCES          = ccd_connection.c \
-                                  ccd_connection_funcs.c
+INCLUDES              = @GTK2_INCS@ @GLOBAL_INCLUDE@
+LDADD                 = @MATCHING_LIBS@ @SHARED_LIBS@ @GTK2_LIBS@
+bin_PROGRAMS          = ccd_connection ccd_connection_gui
 
-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.c
+else 
+# Without GTK
+
+INCLUDES              = @GLOBAL_INCLUDE@
+LDADD                 = @MATCHING_LIBS@ @SHARED_LIBS@
+bin_PROGRAMS          = ccd_connection
+
 endif
 
+ccd_connection_DEPENDENCIES     = ${LDADD}
+ccd_connection_SOURCES          = ccd_connection.c \
+                                  ccd_connection_funcs.c
+
 man_MANS              = man1/ccd_connection.1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.