libgimp: s/GLIB_CFLAGS/GDK_PIXBUF_CFLAGS/ for libgimp in Makefile.am

and some formatting cleanup.
This commit is contained in:
Michael Natterer
2011-04-20 23:38:49 +02:00
parent 27d312b110
commit 058c0b2a0d

View File

@ -360,26 +360,45 @@ libgimp_2_0_la_LDFLAGS = \
$(no_undefined) \ $(no_undefined) \
$(libgimp_export_symbols) $(libgimp_export_symbols)
libgimp_2_0_la_LIBADD = $(libgimpconfig) $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS) $(RT_LIBS) libgimp_2_0_la_LIBADD = \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase) \
$(GDK_PIXBUF_LIBS) \
$(RT_LIBS)
libgimp_2_0_la_DEPENDENCIES = $(gimp_def) $(libgimpconfig) $(libgimpcolor) $(libgimpbase) libgimp_2_0_la_DEPENDENCIES = \
$(gimp_def) \
$(libgimpconfig) \
$(libgimpcolor) \
$(libgimpbase)
libgimpui_2_0_la_LDFLAGS = \ libgimpui_2_0_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpui_export_symbols) $(libgimpui_export_symbols)
libgimpui_2_0_la_LIBADD = $(libgimp) $(libgimpwidgets) $(libgimpcolor) \ libgimpui_2_0_la_LIBADD = \
$(libgimpbase) $(libgimpmodule) $(GTK_LIBS) $(RT_LIBS) $(libgimp) \
$(libgimpwidgets) \
$(libgimpcolor) \
$(libgimpbase) \
$(libgimpmodule) \
$(GTK_LIBS) \
$(RT_LIBS)
libgimpui_2_0_la_DEPENDENCIES = $(gimpui_def) $(libgimp) $(libgimpwidgets) $(libgimpbase) libgimpui_2_0_la_DEPENDENCIES = \
$(gimpui_def) \
$(libgimp) \
$(libgimpwidgets) \
$(libgimpbase)
EXTRA_DIST = \ EXTRA_DIST = \
COPYING \ COPYING \
makefile.msc \ makefile.msc \
gimp.def \ gimp.def \
gimpui.def \ gimpui.def \
$(libgimp_2_0_la_extra_sources) \ $(libgimp_2_0_la_extra_sources) \
$(libgimpui_2_0_la_extra_sources) $(libgimpui_2_0_la_extra_sources)
install-data-local: install-ms-lib install-libtool-import-lib install-data-local: install-ms-lib install-libtool-import-lib