Commit 37800f8b authored by Øyvind Kolås's avatar Øyvind Kolås

added uninstall rule, link with libgegl on win32.

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

svn path=/trunk/; revision=2116
parent 56c46b38
2008-02-25 Øyvind Kolås <pippin@gimp.org>
* 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.
2008-02-25 Sven Neumann <sven@gimp.org>
* docs/gallery/Makefile.am: use a stamp file to avoid needless
......
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_CPPFLAGS = \
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 @@ ext_dir = $(DESTDIR)$(libdir)/gegl-@GEGL_API_VERSION@
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
if OS_WIN32
mwindows = -mwindows
no_undefined = -no-undefined
libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
endif
INCLUDES = \
......@@ -34,4 +35,6 @@ affine_la_SOURCES = \
translate.c \
chant.h
LDADD = $(libgegl)
affine_la_LDFLAGS = -module -avoid-version $(no_undefined) $(mwindows)
if OS_WIN32
mwindows = -mwindows
no_undefined = -no-undefined
libgegl = $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la
endif
INCLUDES = \
......@@ -18,10 +19,7 @@ INCLUDES = \
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.
......
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 @@ INCLUDES = @DEP_CFLAGS@ @BABL_CFLAGS@ @CPPFLAGS@ \
-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
......
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