Commit 5d57933b authored by Øyvind Kolås's avatar Øyvind Kolås

deleted. added. reflect above deletion/addition.

* 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.

svn path=/trunk/; revision=2117
parent 37800f8b
2008-02-25 Øyvind Kolås <pippin@gimp.org>
* 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.
2008-02-25 Øyvind Kolås <pippin@gimp.org> 2008-02-25 Øyvind Kolås <pippin@gimp.org>
* operations/Makefile-operations.am: added uninstall rule, link with * operations/Makefile-operations.am: added uninstall rule, link with
......
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@
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
if OS_WIN32 include $(top_srcdir)/operations/Makefile-common.am
no_undefined = -no-undefined
libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
endif
LDADD = $(op_libs)
CFILES = $(wildcard $(srcdir)/*.c) CFILES = $(wildcard $(srcdir)/*.c)
plugins = $(subst $(srcdir)/,,$(CFILES:.c=.la)) plugins = $(subst $(srcdir)/,,$(CFILES:.c=.la))
INSTALLED_ITEMS = $(subst $(srcdir)/,$(ext_dir)/,$(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) 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=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) $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -rpath $(ext_dir) $@.lo $(LDADD)
...@@ -38,12 +18,10 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegl) ...@@ -38,12 +18,10 @@ LDADD = @DEP_LIBS@ @BABL_LIBS@ $(libgegl)
clean-local: clean-local:
rm -f *.la $(OFILES) rm -f *.la $(OFILES)
ext_dir = $(DESTDIR)$(libdir)/gegl-@GEGL_API_VERSION@
install-exec-local: all-local install-exec-local: all-local
$(INSTALL) -d $(ext_dir) $(INSTALL) -d $(ext_dir)
for i in $(plugins); do \ for i in $(plugins); do \
$(LIBTOOL) --mode=finish $(INSTALL) $$i $(ext_dir) ; \ $(LIBTOOL) --mode=install $(INSTALL) $$i $(ext_dir) ; \
done done
uninstall-local: uninstall-local:
......
...@@ -11,4 +11,4 @@ endif ...@@ -11,4 +11,4 @@ endif
EXTRA_DIST= \ EXTRA_DIST= \
Makefile-operations.am \ Makefile-operations.am \
Makefile-operations-old.am Makefile-common.am
if OS_WIN32 include $(top_srcdir)/operations/Makefile-common.am
mwindows = -mwindows
no_undefined = -no-undefined
libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
endif
INCLUDES = \ affine_ladir = $(ext_dir)
@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_la_LTLIBRARIES = affine.la affine_la_LTLIBRARIES = affine.la
...@@ -35,6 +18,4 @@ affine_la_SOURCES = \ ...@@ -35,6 +18,4 @@ affine_la_SOURCES = \
translate.c \ translate.c \
chant.h chant.h
LDADD = $(libgegl) LDADD = $(op_libs)
affine_la_LDFLAGS = -module -avoid-version $(no_undefined) $(mwindows)
if OS_WIN32 include $(top_srcdir)/operations/Makefile-common.am
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)
# start out with no ops, each if/endif block contains all the bits relevant # start out with no ops, each if/endif block contains all the bits relevant
# for a specific dependency. # for a specific dependency.
...@@ -90,5 +69,5 @@ ff_load_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) ...@@ -90,5 +69,5 @@ ff_load_la_CFLAGS = $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS)
endif endif
endif endif
opdir = $(DESTDIR)$(libdir)/gegl-@GEGL_API_VERSION@ opdir = $(ext_dir)
op_LTLIBRARIES = $(ops) op_LTLIBRARIES = $(ops)
if OS_WIN32 include $(top_srcdir)/operations/Makefile-common.am
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
# start out with no ops, each if/endif block contains all the bits relevant # start out with no ops, each if/endif block contains all the bits relevant
# for a specific dependency. # for a specific dependency.
...@@ -53,5 +34,5 @@ gluas_la_LIBADD = $(op_libs) $(LUA_LIBS) ...@@ -53,5 +34,5 @@ gluas_la_LIBADD = $(op_libs) $(LUA_LIBS)
gluas_la_CFLAGS = $(LUA_CFLAGS) gluas_la_CFLAGS = $(LUA_CFLAGS)
endif endif
opdir = $(DESTDIR)$(libdir)/gegl-@GEGL_API_VERSION@ opdir = $(ext_dir)
op_LTLIBRARIES = $(ops) op_LTLIBRARIES = $(ops)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment