gegl r2082 - in trunk: . operations operations/affine operations/io operations/render

[mitch svn gnome org]

Author: mitch
Date: Thu Feb 21 18:40:49 2008
New Revision: 2082
URL: http://svn.gnome.org/viewvc/gegl?rev=2082&view=rev

Log:
2008-02-21  Michael Natterer  <mitch gimp org>

	* configure.ac: uncomment AM_DISABLE_STATIC.

	* operations/Makefile-operations-old.am: the operations makefile
	as it used to be.

	* operations/Makefile.am: distribute it.

	* operations/affine/Makefile.am
	* operations/io/Makefile.am
	* operations/render/Makefile.am: include it. These directories
	build on darwin but the modules are not found.

	* operations/Makefile-operations.am: hacked up to use libtool so
	it works on darwin and possibly many other platforms. Uninstall is
	totally broken at the moment.



Added:
   trunk/operations/Makefile-operations-old.am
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/operations/Makefile-operations.am
   trunk/operations/Makefile.am
   trunk/operations/affine/Makefile.am
   trunk/operations/io/Makefile.am
   trunk/operations/render/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb 21 18:40:49 2008
@@ -127,7 +127,7 @@
 
 dnl Initialize libtool
 AC_PROG_CC
-#AM_DISABLE_STATIC
+AM_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 

Added: trunk/operations/Makefile-operations-old.am
==============================================================================
--- (empty file)
+++ trunk/operations/Makefile-operations-old.am	Thu Feb 21 18:40:49 2008
@@ -0,0 +1,45 @@
+if OS_WIN32
+no_undefined = -no-undefined
+libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION).dll.a
+else
+libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION)$(SHREXT)
+endif
+
+CFILES          = $(wildcard $(srcdir)/*.c)
+SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=$(SHREXT)))
+INSTALLED_ITEMS = $(subst $(srcdir)/,$(ext_dir)/,$(CFILES:.c=$(SHREXT)))
+GEGLHEADERS     = $(wildcard $(top_srcdir)/gegl/*.h)\
+                  $(wildcard $(top_srcdir)/gegl/buffer/*.h)
+EXTRA_DIST      = $(wildcard *.c) $(wildcard *.h)
+
+all-local: $(SOBJS)
+
+CFLAGS  += @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
+           -I$(srcdir) -I$(top_srcdir)           \
+           -I$(top_builddir)                     \
+           -I$(top_srcdir)/gegl                  \
+           -I$(top_srcdir)/gegl/buffer           \
+           -I$(top_srcdir)/gegl/operation        \
+           -I$(top_srcdir)/gegl/property-types   \
+           -I$(top_srcdir)/gegl/module           \
+           -I. -fPIC
+LDFLAGS += $(DYNAMICLIB) $(no_undefined)
+
+LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(libgegldlla)
+
+%$(SHREXT): %.c $(GEGLHEADERS)
+	@echo $@; $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+
+clean-local:
+	rm -f *$(SHREXT) $(OFILES)
+
+ext_dir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
+
+install-exec-local: all-local
+	$(INSTALL) -d $(ext_dir)
+	-$(INSTALL) $(SOBJS) $(ext_dir)
+
+uninstall-local:
+	rm -f $(INSTALLED_ITEMS)
+
+check-local: all-local

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Thu Feb 21 18:40:49 2008
@@ -1,12 +1,11 @@
 if OS_WIN32
 no_undefined = -no-undefined
-libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION).dll.a
-else
-libgegldlla=$(top_builddir)/gegl/.libs/libgegl-$(GEGL_API_VERSION)$(SHREXT)
 endif
 
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
+
 CFILES          = $(wildcard $(srcdir)/*.c)
-SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=$(SHREXT)))
+SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=.la))
 INSTALLED_ITEMS = $(subst $(srcdir)/,$(ext_dir)/,$(CFILES:.c=$(SHREXT)))
 GEGLHEADERS     = $(wildcard $(top_srcdir)/gegl/*.h)\
                   $(wildcard $(top_srcdir)/gegl/buffer/*.h)
@@ -14,7 +13,7 @@
 
 all-local: $(SOBJS)
 
-CFLAGS  += @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
+AM_CPPFLAGS = @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
            -I$(srcdir) -I$(top_srcdir)           \
            -I$(top_builddir)                     \
            -I$(top_srcdir)/gegl                  \
@@ -22,22 +21,30 @@
            -I$(top_srcdir)/gegl/operation        \
            -I$(top_srcdir)/gegl/property-types   \
            -I$(top_srcdir)/gegl/module           \
-           -I. -fPIC
-LDFLAGS += $(DYNAMICLIB) $(no_undefined)
+           -I
+
+AM_LDFLAGS = -avoid-version -module $(no_undefined)
+
+LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
 
-LDADD    = @DEP_LIBS@ @BABL_LIBS@ $(libgegldlla)
+%.lo: %.c $(GEGLHEADERS)
+	@echo $(LIBTOOL) --tag=CC --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $@ $<
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $@ $<
 
-%$(SHREXT): %.c $(GEGLHEADERS)
-	@echo $@; $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
+%.la: %.lo
+	@echo $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(ext_dir) $< $(LDADD)
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(ext_dir) $< $(LDADD)
 
 clean-local:
-	rm -f *$(SHREXT) $(OFILES)
+	rm -f *.la $(OFILES)
 
 ext_dir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
 
 install-exec-local: all-local
 	$(INSTALL) -d $(ext_dir)
-	-$(INSTALL) $(SOBJS) $(ext_dir)
+	for i in $(SOBJS); do \
+	  $(LIBTOOL) --mode=install $(INSTALL) $$i $(ext_dir) ; \
+	done
 
 uninstall-local:
 	rm -f $(INSTALLED_ITEMS)

Modified: trunk/operations/Makefile.am
==============================================================================
--- trunk/operations/Makefile.am	(original)
+++ trunk/operations/Makefile.am	Thu Feb 21 18:40:49 2008
@@ -16,4 +16,5 @@
 endif
 
 EXTRA_DIST= \
-	Makefile-operations.am
+	Makefile-operations.am	\
+	Makefile-operations-old.am

Modified: trunk/operations/affine/Makefile.am
==============================================================================
--- trunk/operations/affine/Makefile.am	(original)
+++ trunk/operations/affine/Makefile.am	Thu Feb 21 18:40:49 2008
@@ -1,4 +1,4 @@
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-operations-old.am
 
 OFILES      = $(subst $(srcdir)/,,$(CFILES:.c=.o))
 

Modified: trunk/operations/io/Makefile.am
==============================================================================
--- trunk/operations/io/Makefile.am	(original)
+++ trunk/operations/io/Makefile.am	Thu Feb 21 18:40:49 2008
@@ -1,4 +1,4 @@
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-operations-old.am
 
 CXXFILES         = $(wildcard $(srcdir)/*.cpp)
 SOBJS           += $(subst $(srcdir)/,,$(CXXFILES:.cpp=$(SHREXT)))

Modified: trunk/operations/render/Makefile.am
==============================================================================
--- trunk/operations/render/Makefile.am	(original)
+++ trunk/operations/render/Makefile.am	Thu Feb 21 18:40:49 2008
@@ -1,4 +1,4 @@
-include $(top_srcdir)/operations/Makefile-operations.am
+include $(top_srcdir)/operations/Makefile-operations-old.am
 
 EXTRA_DIST += $(wildcard perlin/*.[ch])