gegl r2021 - in trunk: . bin/node-editors operations

[ok svn gnome org]

Author: ok
Date: Fri Feb 15 21:14:37 2008
New Revision: 2021
URL: http://svn.gnome.org/viewvc/gegl?rev=2021&view=rev

Log:
* configure.ac: added check to determine how to compile plug-ins,
a bit of cleanup.
* bin/node-editors/Makefile.am:
* operations/Makefile-operations.am: make it work on darwin as well.


Modified:
   trunk/ChangeLog
   trunk/bin/node-editors/Makefile.am
   trunk/configure.ac
   trunk/operations/Makefile-operations.am

Modified: trunk/bin/node-editors/Makefile.am
==============================================================================
--- trunk/bin/node-editors/Makefile.am	(original)
+++ trunk/bin/node-editors/Makefile.am	Fri Feb 15 21:14:37 2008
@@ -14,7 +14,7 @@
 	   -I$(top_srcdir)/gegl/operation \
 	   -I$(top_srcdir)/gegl/module \
 	   -I$(top_srcdir)/gegl/property-types -fPIC
-LDFLAGS += -shared 
+LDFLAGS += $(DYNAMICLIB)
 
 LDADD    = @DEP_LIBS@ @BABL_LIBS@ @GTK_LIBS@
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 15 21:14:37 2008
@@ -226,6 +226,39 @@
 esac
 AC_MSG_RESULT([$target_or_host])
 
+
+
+####################################################
+# Check how to generate plug-ins (with gcc at least)
+####################################################
+
+AC_MSG_CHECKING([for some Win32 platform])
+case "$target_or_host" in 
+  *-*-darwin*)                 # darwin
+    shrext=.dylib
+    dynamiclib=-dynamiclib
+    ;;
+  *-*-mingw* | *-*-cygwin*)    # windows
+    shrext=.dll
+    dynamiclib=-shared
+    ;;
+  *)                           # linux (and BSD?)
+    dynamiclib=-shared
+    shrext=.so
+    ;;
+esac
+
+SHREXT=$shrext
+AC_SUBST(SHREXT)
+AC_DEFINE_UNQUOTED(SHREXT,     "$shrext",     [File extension for shared libraries])
+
+DYNAMICLIB=$dynamiclib
+AC_SUBST(DYNAMICLIB)
+AC_DEFINE_UNQUOTED(DYNAMICLIB, "$dynamiclib", [Dynamic shared library])
+
+dnl ===========================================================================
+
+
 #################
 # Check for Win32
 #################
@@ -234,11 +267,9 @@
 case "$target_or_host" in 
   *-*-mingw* | *-*-cygwin*)
     platform_win32=yes
-    shrext=.dll
     ;;
   *)
     platform_win32=no
-    shrext=.so
     ;;
 esac
 AC_MSG_RESULT([$platform_win32])
@@ -264,12 +295,6 @@
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
 
-#####################################
-# File extension for shared libraries
-#####################################
-
-SHREXT=$shrext
-AC_SUBST(SHREXT)
 
 #############################
 # Threads and multi processor 

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Fri Feb 15 21:14:37 2008
@@ -21,7 +21,7 @@
            -I$(top_srcdir)/gegl/property-types   \
            -I$(top_srcdir)/gegl/module           \
            -I. -fPIC
-LDFLAGS += -shared $(no_undefined)
+LDFLAGS += $(DYNAMICLIB) $(no_undefined)
 
 LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(libgegldlla)