GNOME.org
 

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

Author: ok
Date: Mon Feb 25 21:30:15 2008
New Revision: 2117
URL: http://svn.gnome.org/viewvc/gegl?rev=2117&view=rev

Log:
* operations/Makefile-operations-old.am: deleted.
* operations/Makefile-common.am: added.
* operations/Makefile.am: reflect above deletion/addition.
* operations/Makefile-operations.am:
* operations/affine/Makefile.am:
* operations/external/Makefile.am:
* operations/workshop/external/Makefile.am: factored out common
bits and include Makefile-common.am.


Added:
   trunk/operations/Makefile-common.am
Removed:
   trunk/operations/Makefile-operations-old.am
Modified:
   trunk/ChangeLog
   trunk/operations/Makefile-operations.am
   trunk/operations/Makefile.am
   trunk/operations/affine/Makefile.am
   trunk/operations/external/Makefile.am
   trunk/operations/workshop/external/Makefile.am

Added: trunk/operations/Makefile-common.am
==============================================================================
--- (empty file)
+++ trunk/operations/Makefile-common.am	Mon Feb 25 21:30:15 2008
@@ -0,0 +1,24 @@
+if OS_WIN32
+no_undefined = -no-undefined
+libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
+endif
+
+GEGLHEADERS     = $(wildcard $(top_srcdir)/gegl/*.h)\
+                  $(wildcard $(top_srcdir)/gegl/buffer/*.h)
+
+AM_CPPFLAGS = \
+	@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
+
+AM_LDFLAGS = -avoid-version -export-dynamic -module $(no_undefined)
+op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
+ext_dir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@

Modified: trunk/operations/Makefile-operations.am
==============================================================================
--- trunk/operations/Makefile-operations.am	(original)
+++ trunk/operations/Makefile-operations.am	Mon Feb 25 21:30:15 2008
@@ -1,36 +1,16 @@
-if OS_WIN32
-no_undefined = -no-undefined
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
-endif
+include $(top_srcdir)/operations/Makefile-common.am
 
+LDADD           = $(op_libs)
 
 CFILES          = $(wildcard $(srcdir)/*.c)
 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: $(plugins)
-
-AM_CPPFLAGS = \
-	@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
-
-AM_LDFLAGS = -avoid-version -export-dynamic -module $(no_undefined)
 
-LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
+all-local: $(plugins)
 
-%.la: %.c
+%.la: %.c $(GEGLHEADERS)
 	$(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)
 
@@ -38,12 +18,10 @@
 clean-local:
 	rm -f *.la $(OFILES)
 
-ext_dir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
-
 install-exec-local: all-local
 	$(INSTALL) -d $(ext_dir)
 	for i in $(plugins); do \
-	  $(LIBTOOL) --mode=finish $(INSTALL) $$i $(ext_dir) ; \
+	  $(LIBTOOL) --mode=install $(INSTALL) $$i $(ext_dir) ; \
 	done
 
 uninstall-local:

Modified: trunk/operations/Makefile.am
==============================================================================
--- trunk/operations/Makefile.am	(original)
+++ trunk/operations/Makefile.am	Mon Feb 25 21:30:15 2008
@@ -11,4 +11,4 @@
 
 EXTRA_DIST= \
 	Makefile-operations.am	\
-	Makefile-operations-old.am
+	Makefile-common.am

Modified: trunk/operations/affine/Makefile.am
==============================================================================
--- trunk/operations/affine/Makefile.am	(original)
+++ trunk/operations/affine/Makefile.am	Mon Feb 25 21:30:15 2008
@@ -1,23 +1,6 @@
-if OS_WIN32     
-mwindows = -mwindows
-no_undefined = -no-undefined
-libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
-endif
+include $(top_srcdir)/operations/Makefile-common.am
 
-INCLUDES = \
-	@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
-
-affine_ladir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
+affine_ladir = $(ext_dir)
 
 affine_la_LTLIBRARIES = affine.la
 
@@ -35,6 +18,4 @@
 	translate.c	\
 	chant.h
 
-LDADD = $(libgegl)
-
-affine_la_LDFLAGS = -module -avoid-version $(no_undefined) $(mwindows) 
+LDADD = $(op_libs)

Modified: trunk/operations/external/Makefile.am
==============================================================================
--- trunk/operations/external/Makefile.am	(original)
+++ trunk/operations/external/Makefile.am	Mon Feb 25 21:30:15 2008
@@ -1,25 +1,4 @@
-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@				\
-	-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
-
-AM_LDFLAGS = -avoid-version -module $(no_undefined)
-
-op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
+include $(top_srcdir)/operations/Makefile-common.am
 
 # start out with no ops, each if/endif block contains all the bits relevant
 # for a specific dependency.
@@ -90,5 +69,5 @@
 endif
 endif
 
-opdir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
+opdir = $(ext_dir)
 op_LTLIBRARIES = $(ops)

Modified: trunk/operations/workshop/external/Makefile.am
==============================================================================
--- trunk/operations/workshop/external/Makefile.am	(original)
+++ trunk/operations/workshop/external/Makefile.am	Mon Feb 25 21:30:15 2008
@@ -1,23 +1,4 @@
-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@ \
-           -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.
-AM_LDFLAGS = -avoid-version -module $(no_undefined)
-
-op_libs = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
-### the stuff above this line could potentially be moved to a common file
-### to reduce duplication
+include $(top_srcdir)/operations/Makefile-common.am
 
 # start out with no ops, each if/endif block contains all the bits relevant
 # for a specific dependency.
@@ -53,5 +34,5 @@
 gluas_la_CFLAGS  = $(LUA_CFLAGS)
 endif
 
-opdir = $(DESTDIR)$(libdir)/gegl- GEGL_API_VERSION@
+opdir = $(ext_dir)
 op_LTLIBRARIES = $(ops)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]