Commit 13ee151a authored by Michael Natterer's avatar Michael Natterer

libgimp*: use LIBADD and DEPENDENCIES consistently in all Makefiles

parent 9c7cd250
......@@ -377,6 +377,8 @@ libgimp_@GIMP_API_VERSION@_la_LDFLAGS = \
$(libgimp_export_symbols) \
$(framework_cocoa)
libgimp_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimp_def)
libgimp_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpconfig) \
$(libgimpcolor) \
......@@ -386,18 +388,14 @@ libgimp_@GIMP_API_VERSION@_la_LIBADD = \
$(GDK_PIXBUF_LIBS) \
$(RT_LIBS)
libgimp_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimp_def) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase)
libgimpui_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \
$(no_undefined) \
$(libgimpui_export_symbols) \
$(framework_cocoa)
libgimpui_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpui_def)
libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimp) \
$(libgimpwidgets) \
......@@ -408,12 +406,6 @@ libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
$(GEXIV2_LIBS) \
$(RT_LIBS)
libgimpui_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimpui_def) \
$(libgimp) \
$(libgimpwidgets) \
$(libgimpbase)
EXTRA_DIST = \
COPYING \
gimp.def \
......
......@@ -108,11 +108,10 @@ libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \
$(libgimpcolor_export_symbols)
libgimpcolor_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimpcolor_def) \
$(libgimpbase)
libgimpcolor_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpcolor_def)
libgimpcolor_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \
$(GEGL_LIBS) \
$(CAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \
......
......@@ -80,11 +80,10 @@ libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \
$(no_undefined) \
$(libgimpmath_export_symbols)
libgimpmath_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimpmath_def) \
$(libgimpbase)
libgimpmath_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmath_def)
libgimpmath_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \
$(GLIB_LIBS) \
$(libm)
......
......@@ -256,21 +256,21 @@ libgimpwidgetsinclude_HEADERS = \
gimp3migration.h
libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO)\
$(no_undefined) \
-version-info $(LT_VERSION_INFO) \
$(no_undefined) \
$(libgimpwidgets_export_symbols)
libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpbase) \
$(libgimpcolor) \
$(libgimpconfig) \
$(libgimpbase) \
$(LCMS_LIBS) \
$(GEGL_LIBS) \
$(GTK_LIBS) \
$(libm)
libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
## 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_DEPENDENCIES = \
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
$(libgimpbase) \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
test_preview_area_LDADD = \
$(GTK_LIBS) \
$(GTK_LIBS) \
$(test_preview_area_DEPENDENCIES)
......@@ -360,7 +360,7 @@ test_eevl_DEPENDENCIES = \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
test_eevl_LDADD = \
$(GLIB_LIBS) \
$(GLIB_LIBS) \
$(test_eevl_DEPENDENCIES)
......
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