From 486e76bdab8d2eef94bc20a5917bb957f2cf349d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 4 May 2012 15:37:43 +0200 Subject: [PATCH] libgimp*: use GIMP_API_VERSION in Makefile.am instead of hardcoding 2.0 --- libgimp/Makefile.am | 42 +++++++++++++++++++------------------- libgimpbase/Makefile.am | 14 ++++++++----- libgimpcolor/Makefile.am | 10 ++++----- libgimpconfig/Makefile.am | 13 ++++++------ libgimpmath/Makefile.am | 14 ++++++++----- libgimpmodule/Makefile.am | 10 ++++----- libgimpthumb/Makefile.am | 10 +++++---- libgimpwidgets/Makefile.am | 24 +++++++++++----------- 8 files changed, 74 insertions(+), 63 deletions(-) diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 23cda1fad7..d99d0cd1fc 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -67,7 +67,7 @@ INCLUDES = \ $(GEGL_CFLAGS) \ -I$(includedir) -lib_LTLIBRARIES = libgimp-2.0.la libgimpui-2.0.la +lib_LTLIBRARIES = libgimp-@GIMP_API_VERSION@.la libgimpui-@GIMP_API_VERSION@.la PDB_WRAPPERS_C = \ gimp_pdb.c \ @@ -174,7 +174,7 @@ PDB_WRAPPERS_H = \ gimpunit_pdb.h \ gimpvectors_pdb.h -libgimp_2_0_la_sources = \ +libgimp_sources = \ gimp.c \ gimp.h \ gimpcompat.h \ @@ -239,16 +239,16 @@ libgimp_2_0_la_sources = \ stdplugins-intl.h \ libgimp-intl.h -libgimp_2_0_la_built_sources = \ +libgimp_built_sources = \ gimpenums.c -libgimp_2_0_la_extra_sources = gimpenums.c.tail +libgimp_extra_sources = gimpenums.c.tail -libgimp_2_0_la_SOURCES = \ - $(libgimp_2_0_la_built_sources) \ - $(libgimp_2_0_la_sources) +libgimp_@GIMP_API_VERSION@_la_SOURCES = \ + $(libgimp_built_sources) \ + $(libgimp_sources) -libgimpui_2_0_la_sources = \ +libgimpui_sources = \ gimpui.c \ gimpui.h \ gimpuitypes.h \ @@ -295,15 +295,15 @@ libgimpui_2_0_la_sources = \ gimpzoompreview.c \ gimpzoompreview.h -libgimpui_2_0_la_built_sources = \ +libgimpui_built_sources = \ gimpuimarshal.c \ gimpuimarshal.h -libgimpui_2_0_la_extra_sources = gimpuimarshal.list +libgimpui_extra_sources = gimpuimarshal.list -libgimpui_2_0_la_SOURCES = \ - $(libgimpui_2_0_la_built_sources) \ - $(libgimpui_2_0_la_sources) +libgimpui_@GIMP_API_VERSION@_la_SOURCES = \ + $(libgimpui_built_sources) \ + $(libgimpui_sources) gimpinclude_HEADERS = \ gimp.h \ @@ -361,12 +361,12 @@ gimpinclude_HEADERS = \ gimpselectbutton.h \ gimpzoompreview.h -libgimp_2_0_la_LDFLAGS = \ +libgimp_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimp_export_symbols) -libgimp_2_0_la_LIBADD = \ +libgimp_@GIMP_API_VERSION@_la_LIBADD = \ $(libgimpconfig) \ $(libgimpcolor) \ $(libgimpbase) \ @@ -375,18 +375,18 @@ libgimp_2_0_la_LIBADD = \ $(GDK_PIXBUF_LIBS) \ $(RT_LIBS) -libgimp_2_0_la_DEPENDENCIES = \ +libgimp_@GIMP_API_VERSION@_la_DEPENDENCIES = \ $(gimp_def) \ $(libgimpconfig) \ $(libgimpcolor) \ $(libgimpbase) -libgimpui_2_0_la_LDFLAGS = \ +libgimpui_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpui_export_symbols) -libgimpui_2_0_la_LIBADD = \ +libgimpui_@GIMP_API_VERSION@_la_LIBADD = \ $(libgimp) \ $(libgimpwidgets) \ $(libgimpcolor) \ @@ -395,7 +395,7 @@ libgimpui_2_0_la_LIBADD = \ $(GTK_LIBS) \ $(RT_LIBS) -libgimpui_2_0_la_DEPENDENCIES = \ +libgimpui_@GIMP_API_VERSION@_la_DEPENDENCIES = \ $(gimpui_def) \ $(libgimp) \ $(libgimpwidgets) \ @@ -405,8 +405,8 @@ EXTRA_DIST = \ COPYING \ gimp.def \ gimpui.def \ - $(libgimp_2_0_la_extra_sources) \ - $(libgimpui_2_0_la_extra_sources) + $(libgimp_extra_sources) \ + $(libgimpui_extra_sources) install-data-local: install-ms-lib install-libtool-import-lib diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index e01f7c08cb..5113c42513 100644 --- a/libgimpbase/Makefile.am +++ b/libgimpbase/Makefile.am @@ -67,7 +67,7 @@ INCLUDES = \ EXTRA_DIST = \ gimpbase.def -lib_LTLIBRARIES = libgimpbase-2.0.la +lib_LTLIBRARIES = libgimpbase-@GIMP_API_VERSION@.la # help `make' along by giving another name for the file, which it knows # how to build @@ -121,7 +121,9 @@ libgimpbase_sources = \ libgimpbase_built_sources = \ gimpbaseenums.c -libgimpbase_2_0_la_SOURCES = $(libgimpbase_sources) $(libgimpbase_built_sources) +libgimpbase_@GIMP_API_VERSION@_la_SOURCES = \ + $(libgimpbase_sources) \ + $(libgimpbase_built_sources) libgimpbaseinclude_HEADERS = \ @@ -146,15 +148,17 @@ libgimpbaseinclude_HEADERS = \ gimpvaluearray.h -libgimpbase_2_0_la_LDFLAGS = \ +libgimpbase_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpbase_export_symbols) \ $(CARBON_LDFLAGS) -libgimpbase_2_0_la_DEPENDENCIES = $(gimpbase_def) +libgimpbase_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def) -libgimpbase_2_0_la_LIBADD = $(GLIB_LIBS) $(ole32_lib) +libgimpbase_@GIMP_API_VERSION@_la_LIBADD = \ + $(GLIB_LIBS) \ + $(ole32_lib) install-data-local: install-ms-lib install-libtool-import-lib diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 8b54bb632e..20f43faf4c 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -60,9 +60,9 @@ INCLUDES = \ EXTRA_DIST = \ gimpcolor.def -lib_LTLIBRARIES = libgimpcolor-2.0.la +lib_LTLIBRARIES = libgimpcolor-@GIMP_API_VERSION@.la -libgimpcolor_2_0_la_SOURCES = \ +libgimpcolor_@GIMP_API_VERSION@_la_SOURCES = \ gimpcolor.h \ gimpcolortypes.h \ gimpadaptivesupersample.c \ @@ -101,16 +101,16 @@ libgimpcolorinclude_HEADERS = \ gimppixbuf.h \ gimprgb.h -libgimpcolor_2_0_la_LDFLAGS = \ +libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpcolor_export_symbols) -libgimpcolor_2_0_la_DEPENDENCIES = \ +libgimpcolor_@GIMP_API_VERSION@_la_DEPENDENCIES = \ $(gimpcolor_def) \ $(libgimpbase) -libgimpcolor_2_0_la_LIBADD = \ +libgimpcolor_@GIMP_API_VERSION@_la_LIBADD = \ $(GEGL_LIBS) \ $(CAIRO_LIBS) \ $(GDK_PIXBUF_LIBS) \ diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am index bca564dba2..2c6d46b805 100644 --- a/libgimpconfig/Makefile.am +++ b/libgimpconfig/Makefile.am @@ -57,7 +57,7 @@ INCLUDES = \ EXTRA_DIST = \ gimpconfig.def -lib_LTLIBRARIES = libgimpconfig-2.0.la +lib_LTLIBRARIES = libgimpconfig-@GIMP_API_VERSION@.la libgimpconfig_sources = \ gimpconfig.h \ @@ -86,8 +86,9 @@ libgimpconfig_sources = \ libgimpconfig_built_sources = \ gimpcolorconfig-enums.c -libgimpconfig_2_0_la_SOURCES = \ - $(libgimpconfig_sources) $(libgimpconfig_built_sources) +libgimpconfig_@GIMP_API_VERSION@_la_SOURCES = \ + $(libgimpconfig_sources) \ + $(libgimpconfig_built_sources) libgimpconfiginclude_HEADERS = \ @@ -106,14 +107,14 @@ libgimpconfiginclude_HEADERS = \ gimpcolorconfig-enums.h -libgimpconfig_2_0_la_LDFLAGS = \ +libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpconfig_export_symbols) -libgimpconfig_2_0_la_DEPENDENCIES = $(gimpconfig_def) +libgimpconfig_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpconfig_def) -libgimpconfig_2_0_la_LIBADD = \ +libgimpconfig_@GIMP_API_VERSION@_la_LIBADD = \ $(libgimpbase) \ $(libgimpcolor) \ $(libgimpmath) \ diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am index 12010637fa..57d5020068 100644 --- a/libgimpmath/Makefile.am +++ b/libgimpmath/Makefile.am @@ -58,9 +58,9 @@ INCLUDES = \ EXTRA_DIST = \ gimpmath.def -lib_LTLIBRARIES = libgimpmath-2.0.la +lib_LTLIBRARIES = libgimpmath-@GIMP_API_VERSION@.la -libgimpmath_2_0_la_SOURCES = \ +libgimpmath_@GIMP_API_VERSION@_la_SOURCES = \ gimpmath.h \ gimpmathtypes.h \ gimpmatrix.c \ @@ -77,14 +77,18 @@ libgimpmathinclude_HEADERS = \ gimpmd5.h \ gimpvector.h -libgimpmath_2_0_la_LDFLAGS = \ +libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpmath_export_symbols) -libgimpmath_2_0_la_DEPENDENCIES = $(gimpmath_def) $(libgimpbase) +libgimpmath_@GIMP_API_VERSION@_la_DEPENDENCIES = \ + $(gimpmath_def) \ + $(libgimpbase) -libgimpmath_2_0_la_LIBADD = $(GLIB_LIBS) $(libm) +libgimpmath_@GIMP_API_VERSION@_la_LIBADD = \ + $(GLIB_LIBS) \ + $(libm) install-data-local: install-ms-lib install-libtool-import-lib diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am index 9d8dcc4423..4379a62b7e 100644 --- a/libgimpmodule/Makefile.am +++ b/libgimpmodule/Makefile.am @@ -54,9 +54,9 @@ INCLUDES = \ EXTRA_DIST = \ gimpmodule.def -lib_LTLIBRARIES = libgimpmodule-2.0.la +lib_LTLIBRARIES = libgimpmodule-@GIMP_API_VERSION@.la -libgimpmodule_2_0_la_SOURCES = \ +libgimpmodule_@GIMP_API_VERSION@_la_SOURCES = \ gimpmoduletypes.h \ gimpmodule.c \ gimpmodule.h \ @@ -68,14 +68,14 @@ libgimpmoduleinclude_HEADERS = \ gimpmodule.h \ gimpmoduledb.h -libgimpmodule_2_0_la_LDFLAGS = \ +libgimpmodule_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpmodule_export_symbols) -libgimpmodule_2_0_la_DEPENDENCIES = $(gimpmodule_def) +libgimpmodule_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpmodule_def) -libgimpmodule_2_0_la_LIBADD = \ +libgimpmodule_@GIMP_API_VERSION@_la_LIBADD = \ $(libgimpbase) \ $(GMODULE_NO_EXPORT_LIBS) \ $(GLIB_LIBS) diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index 07c157b72d..4f07a62e20 100644 --- a/libgimpthumb/Makefile.am +++ b/libgimpthumb/Makefile.am @@ -52,9 +52,9 @@ INCLUDES = \ EXTRA_DIST = \ gimpthumb.def -lib_LTLIBRARIES = libgimpthumb-2.0.la +lib_LTLIBRARIES = libgimpthumb-@GIMP_API_VERSION@.la -libgimpthumb_2_0_la_SOURCES = \ +libgimpthumb_@GIMP_API_VERSION@_la_SOURCES = \ gimpthumb.h \ gimpthumb-enums.c \ gimpthumb-enums.h \ @@ -74,12 +74,14 @@ libgimpthumbinclude_HEADERS = \ gimpthumb-utils.h \ gimpthumbnail.h -libgimpthumb_2_0_la_LDFLAGS = \ +libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO) \ $(no_undefined) \ $(libgimpthumb_export_symbols) -libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) +libgimpthumb_@GIMP_API_VERSION@_la_LIBADD = \ + $(GDK_PIXBUF_LIBS) \ + $(GLIB_LIBS) noinst_PROGRAMS = gimp-thumbnail-list diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am index c2717e2d0f..6d45f89775 100644 --- a/libgimpwidgets/Makefile.am +++ b/libgimpwidgets/Makefile.am @@ -58,9 +58,9 @@ INCLUDES = \ $(GTK_CFLAGS) \ -I$(includedir) -lib_LTLIBRARIES = libgimpwidgets-2.0.la +lib_LTLIBRARIES = libgimpwidgets-@GIMP_API_VERSION@.la -libgimpwidgets_2_0_la_sources = \ +libgimpwidgets_sources = \ gimpbrowser.c \ gimpbrowser.h \ gimpbutton.c \ @@ -181,17 +181,17 @@ libgimpwidgets_2_0_la_sources = \ gimp3migration.c \ gimp3migration.h -libgimpwidgets_2_0_la_built_sources = \ +libgimpwidgets_built_sources = \ gimp-wilber-pixbufs.h \ gimpwidgetsenums.c \ gimpwidgetsmarshal.c \ gimpwidgetsmarshal.h -libgimpwidgets_2_0_la_extra_sources = gimpwidgetsmarshal.list +libgimpwidgets_extra_sources = gimpwidgetsmarshal.list -libgimpwidgets_2_0_la_SOURCES = \ - $(libgimpwidgets_2_0_la_built_sources) \ - $(libgimpwidgets_2_0_la_sources) +libgimpwidgets_@GIMP_API_VERSION@_la_SOURCES = \ + $(libgimpwidgets_built_sources) \ + $(libgimpwidgets_sources) libgimpwidgetsinclude_HEADERS = \ gimpbrowser.h \ @@ -253,12 +253,12 @@ libgimpwidgetsinclude_HEADERS = \ gimpzoommodel.h \ gimp3migration.h -libgimpwidgets_2_0_la_LDFLAGS = \ +libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \ -version-info $(LT_VERSION_INFO)\ $(no_undefined) \ $(libgimpwidgets_export_symbols) -libgimpwidgets_2_0_la_LIBADD = \ +libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \ $(libgimpcolor) \ $(libgimpconfig) \ $(libgimpbase) \ @@ -266,7 +266,7 @@ libgimpwidgets_2_0_la_LIBADD = \ $(GTK_LIBS) \ $(libm) -libgimpwidgets_2_0_la_DEPENDENCIES = $(gimpwidgets_def) +libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def) ## Wilber icons for the window managaer, compiled in @@ -285,8 +285,8 @@ WILBER_VARIABLES = \ EXTRA_DIST = \ - gimpwidgets.def \ - $(libgimpwidgets_2_0_la_extra_sources) \ + gimpwidgets.def \ + $(libgimpwidgets_extra_sources) \ $(WILBER_IMAGES)