gegl r2116 - in trunk: . operations operations/affine operations/external operations/workshop/external

[ok svn gnome org]

Author: ok
Date: Mon Feb 25 20:55:58 2008
New Revision: 2116
URL: http://svn.gnome.org/viewvc/gegl?rev=2116&view=rev

Log:
* operations/Makefile-operations.am: added uninstall rule, link with
libgegl on win32.
* operations/affine/Makefile.am:
* operations/external/Makefile.am:
* operations/workshop/external/Makefile.am: link with libgegl on
win32.


Modified:
   trunk/ChangeLog
   trunk/operations/Makefile-operations.am
   trunk/operations/affine/Makefile.am
   trunk/operations/external/Makefile.am
   trunk/operations/workshop/external/Makefile.am

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Mon Feb 25 20:55:58 2008
@@ -1,17 +1,17 @@
 if OS_WIN32
 no_undefined = -no-undefined
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 endif
 
-#libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 
 CFILES          = $(wildcard $(srcdir)/*.c)
-SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=.la))
+plugins           = $(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)
 EXTRA_DIST      = $(wildcard *.c) $(wildcard *.h)
 
-all-local: $(SOBJS)
+all-local: $(plugins)
 
 AM_CPPFLAGS = \
 	@DEP_CFLAGS@				\
@@ -28,16 +28,11 @@
 
 AM_LDFLAGS = -avoid-version -export-dynamic -module $(no_undefined)
 
-LDADD = @DEP_LIBS@ @BABL_LIBS@
-#$(libgegl)
+LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
 
-%.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 $@ $<
-
-%.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)
+%.la: %.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o $  lo $<
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(ext_dir) $  lo $(LDADD)
 
 
 clean-local:
@@ -47,11 +42,13 @@
 
 install-exec-local: all-local
 	$(INSTALL) -d $(ext_dir)
-	for i in $(SOBJS); do \
-	  $(LIBTOOL) --mode=install $(INSTALL) $$i $(ext_dir) ; \
+	for i in $(plugins); do \
+	  $(LIBTOOL) --mode=finish $(INSTALL) $$i $(ext_dir) ; \
 	done
 
 uninstall-local:
-	rm -f $(INSTALLED_ITEMS)
+	for i in $(plugins); do \
+	  $(LIBTOOL) --mode=uninstall $(RM) $(ext_dir)/$$i ; \
+	done
 
 check-local: all-local

Modified: trunk/operations/affine/Makefile.am
==============================================================================
--- trunk/operations/affine/Makefile.am	(original)
+++ trunk/operations/affine/Makefile.am	Mon Feb 25 20:55:58 2008
@@ -1,6 +1,7 @@
 if OS_WIN32     
 mwindows = -mwindows
 no_undefined = -no-undefined
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 endif
 
 INCLUDES = \
@@ -34,4 +35,6 @@
 	translate.c	\
 	chant.h
 
+LDADD = $(libgegl)
+
 affine_la_LDFLAGS = -module -avoid-version $(no_undefined) $(mwindows) 

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Mon Feb 25 20:55:58 2008
@@ -1,6 +1,7 @@
 if OS_WIN32
 mwindows = -mwindows
 no_undefined = -no-undefined
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 endif
 
 INCLUDES = \
@@ -18,10 +19,7 @@
 
 AM_LDFLAGS = -avoid-version -module $(no_undefined)
 
-#libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
-
-op_libs = @DEP_LIBS@ @BABL_LIBS@
-#$(libgegl)
+op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
 
 # start out with no ops, each if/endif block contains all the bits relevant
 # for a specific dependency.

Modified: trunk/operations/workshop/external/Makefile.am
==============================================================================
--- trunk/operations/workshop/external/Makefile.am	(original)
+++ trunk/operations/workshop/external/Makefile.am	Mon Feb 25 20:55:58 2008
@@ -1,6 +1,7 @@
 if OS_WIN32
 mwindows = -mwindows
 no_undefined = -no-undefined
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 endif
 
 INCLUDES = @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
@@ -13,7 +14,6 @@
            -I$(top_srcdir)/gegl/module           \
            -I.
 AM_LDFLAGS = -avoid-version -module $(no_undefined)
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
 
 op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
 ### the stuff above this line could potentially be moved to a common file