callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimp*: use LIBADD and DEPENDENCIES consistently in all Makefiles

Browse Source
This commit is contained in:
Michael Natterer
2014-03-14 22:39:02 +01:00
parent 9c7cd2508f
commit 13ee151a1e
4 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libgimp/Makefile.am
View File

@ -377,6 +377,8 @@ libgimp_@GIMP_API_VERSION@_la_LDFLAGS = \
$(libgimp_export_symbols) \ $(libgimp_export_symbols) \
$(framework_cocoa) $(framework_cocoa)
libgimp_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimp_def)
libgimp_@GIMP_API_VERSION@_la_LIBADD = \ libgimp_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpconfig) \ $(libgimpconfig) \
$(libgimpcolor) \ $(libgimpcolor) \
@ -386,18 +388,14 @@ libgimp_@GIMP_API_VERSION@_la_LIBADD = \
$(GDK_PIXBUF_LIBS) \ $(GDK_PIXBUF_LIBS) \
$(RT_LIBS) $(RT_LIBS)
libgimp_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimp_def) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase)
libgimpui_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpui_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpui_export_symbols) \ $(libgimpui_export_symbols) \
$(framework_cocoa) $(framework_cocoa)
libgimpui_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpui_def)
libgimpui_@GIMP_API_VERSION@_la_LIBADD = \ libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimp) \ $(libgimp) \
$(libgimpwidgets) \ $(libgimpwidgets) \
@ -408,12 +406,6 @@ libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
$(GEXIV2_LIBS) \ $(GEXIV2_LIBS) \
$(RT_LIBS) $(RT_LIBS)
libgimpui_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimpui_def) \
$(libgimp) \
$(libgimpwidgets) \
$(libgimpbase)
EXTRA_DIST = \ EXTRA_DIST = \
COPYING \ COPYING \
gimp.def \ gimp.def \

5
libgimpcolor/Makefile.am
View File

@ -108,11 +108,10 @@ libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpcolor_export_symbols) $(libgimpcolor_export_symbols)
libgimpcolor_@GIMP_API_VERSION@_la_DEPENDENCIES = \ libgimpcolor_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpcolor_def)
$(gimpcolor_def) \
$(libgimpbase)
libgimpcolor_@GIMP_API_VERSION@_la_LIBADD = \ libgimpcolor_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \
$(GEGL_LIBS) \ $(GEGL_LIBS) \
$(CAIRO_LIBS) \ $(CAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \ $(GDK_PIXBUF_LIBS) \

5
libgimpmath/Makefile.am
View File

@ -80,11 +80,10 @@ libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimpmath_export_symbols) $(libgimpmath_export_symbols)
libgimpmath_@GIMP_API_VERSION@_la_DEPENDENCIES = \ libgimpmath_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmath_def)
$(gimpmath_def) \
$(libgimpbase)
libgimpmath_@GIMP_API_VERSION@_la_LIBADD = \ libgimpmath_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(libm) $(libm)

16
libgimpwidgets/Makefile.am
View File

@ -256,21 +256,21 @@ libgimpwidgetsinclude_HEADERS = \
gimp3migration.h gimp3migration.h
libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \ libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO)\ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpwidgets_export_symbols) $(libgimpwidgets_export_symbols)
libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \ libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \
$(libgimpcolor) \ $(libgimpcolor) \
$(libgimpconfig) \ $(libgimpconfig) \
$(libgimpbase) \
$(LCMS_LIBS) \ $(LCMS_LIBS) \
$(GEGL_LIBS) \ $(GEGL_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(libm) $(libm)
libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
## Wilber icons for the window managaer, compiled in ## Wilber icons for the window managaer, compiled in
@ -345,11 +345,11 @@ EXTRA_PROGRAMS = \
test_preview_area_SOURCES = test-preview-area.c test_preview_area_SOURCES = test-preview-area.c
test_preview_area_DEPENDENCIES = \ test_preview_area_DEPENDENCIES = \
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \ $(libgimpbase) \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
test_preview_area_LDADD = \ test_preview_area_LDADD = \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(test_preview_area_DEPENDENCIES) $(test_preview_area_DEPENDENCIES)
@ -360,7 +360,7 @@ test_eevl_DEPENDENCIES = \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
test_eevl_LDADD = \ test_eevl_LDADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(test_eevl_DEPENDENCIES) $(test_eevl_DEPENDENCIES)