procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 09:53:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

libgimp*: use GIMP_API_VERSION in Makefile.am instead of hardcoding 2.0

Browse source
This commit is contained in:
Michael Natterer 2012-05-04 15:37:43 +02:00
parent 23896bb7d4
commit 486e76bdab
8 changed files with 74 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libgimp/Makefile.am
View file

@ -67,7 +67,7 @@ INCLUDES = \
$(GEGL_CFLAGS) \ $(GEGL_CFLAGS) \
-I$(includedir) -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 = \ PDB_WRAPPERS_C = \
gimp_pdb.c \ gimp_pdb.c \
@ -174,7 +174,7 @@ PDB_WRAPPERS_H = \
gimpunit_pdb.h \ gimpunit_pdb.h \
gimpvectors_pdb.h gimpvectors_pdb.h
libgimp_2_0_la_sources = \ libgimp_sources = \
gimp.c \ gimp.c \
gimp.h \ gimp.h \
gimpcompat.h \ gimpcompat.h \
@ -239,16 +239,16 @@ libgimp_2_0_la_sources = \
stdplugins-intl.h \ stdplugins-intl.h \
libgimp-intl.h libgimp-intl.h
libgimp_2_0_la_built_sources = \ libgimp_built_sources = \
gimpenums.c gimpenums.c
libgimp_2_0_la_extra_sources = gimpenums.c.tail libgimp_extra_sources = gimpenums.c.tail
libgimp_2_0_la_SOURCES = \ libgimp_@GIMP_API_VERSION@_la_SOURCES = \
$(libgimp_2_0_la_built_sources) \ $(libgimp_built_sources) \
$(libgimp_2_0_la_sources) $(libgimp_sources)
libgimpui_2_0_la_sources = \ libgimpui_sources = \
gimpui.c \ gimpui.c \
gimpui.h \ gimpui.h \
gimpuitypes.h \ gimpuitypes.h \
@ -295,15 +295,15 @@ libgimpui_2_0_la_sources = \
gimpzoompreview.c \ gimpzoompreview.c \
gimpzoompreview.h gimpzoompreview.h
libgimpui_2_0_la_built_sources = \ libgimpui_built_sources = \
gimpuimarshal.c \ gimpuimarshal.c \
gimpuimarshal.h gimpuimarshal.h
libgimpui_2_0_la_extra_sources = gimpuimarshal.list libgimpui_extra_sources = gimpuimarshal.list
libgimpui_2_0_la_SOURCES = \ libgimpui_@GIMP_API_VERSION@_la_SOURCES = \
$(libgimpui_2_0_la_built_sources) \ $(libgimpui_built_sources) \
$(libgimpui_2_0_la_sources) $(libgimpui_sources)
gimpinclude_HEADERS = \ gimpinclude_HEADERS = \
gimp.h \ gimp.h \
@ -361,12 +361,12 @@ gimpinclude_HEADERS = \
gimpselectbutton.h \ gimpselectbutton.h \
gimpzoompreview.h gimpzoompreview.h
libgimp_2_0_la_LDFLAGS = \ libgimp_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimp_export_symbols) $(libgimp_export_symbols)
libgimp_2_0_la_LIBADD = \ libgimp_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpconfig) \ $(libgimpconfig) \
$(libgimpcolor) \ $(libgimpcolor) \
$(libgimpbase) \ $(libgimpbase) \
@ -375,18 +375,18 @@ libgimp_2_0_la_LIBADD = \
$(GDK_PIXBUF_LIBS) \ $(GDK_PIXBUF_LIBS) \
$(RT_LIBS) $(RT_LIBS)
libgimp_2_0_la_DEPENDENCIES = \ libgimp_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimp_def) \ $(gimp_def) \
$(libgimpconfig) \ $(libgimpconfig) \
$(libgimpcolor) \ $(libgimpcolor) \
$(libgimpbase) $(libgimpbase)
libgimpui_2_0_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)
libgimpui_2_0_la_LIBADD = \ libgimpui_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimp) \ $(libgimp) \
$(libgimpwidgets) \ $(libgimpwidgets) \
$(libgimpcolor) \ $(libgimpcolor) \
@ -395,7 +395,7 @@ libgimpui_2_0_la_LIBADD = \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(RT_LIBS) $(RT_LIBS)
libgimpui_2_0_la_DEPENDENCIES = \ libgimpui_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimpui_def) \ $(gimpui_def) \
$(libgimp) \ $(libgimp) \
$(libgimpwidgets) \ $(libgimpwidgets) \
@ -405,8 +405,8 @@ EXTRA_DIST = \
COPYING \ COPYING \
gimp.def \ gimp.def \
gimpui.def \ gimpui.def \
$(libgimp_2_0_la_extra_sources) \ $(libgimp_extra_sources) \
$(libgimpui_2_0_la_extra_sources) $(libgimpui_extra_sources)
install-data-local: install-ms-lib install-libtool-import-lib install-data-local: install-ms-lib install-libtool-import-lib

14
libgimpbase/Makefile.am
View file

@ -67,7 +67,7 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpbase.def 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 # help `make' along by giving another name for the file, which it knows
# how to build # how to build
@ -121,7 +121,9 @@ libgimpbase_sources = \
libgimpbase_built_sources = \ libgimpbase_built_sources = \
gimpbaseenums.c 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 = \ libgimpbaseinclude_HEADERS = \
@ -146,15 +148,17 @@ libgimpbaseinclude_HEADERS = \
gimpvaluearray.h gimpvaluearray.h
libgimpbase_2_0_la_LDFLAGS = \ libgimpbase_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpbase_export_symbols) \ $(libgimpbase_export_symbols) \
$(CARBON_LDFLAGS) $(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 install-data-local: install-ms-lib install-libtool-import-lib

10
libgimpcolor/Makefile.am
View file

@ -60,9 +60,9 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpcolor.def 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 \ gimpcolor.h \
gimpcolortypes.h \ gimpcolortypes.h \
gimpadaptivesupersample.c \ gimpadaptivesupersample.c \
@ -101,16 +101,16 @@ libgimpcolorinclude_HEADERS = \
gimppixbuf.h \ gimppixbuf.h \
gimprgb.h gimprgb.h
libgimpcolor_2_0_la_LDFLAGS = \ libgimpcolor_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpcolor_export_symbols) $(libgimpcolor_export_symbols)
libgimpcolor_2_0_la_DEPENDENCIES = \ libgimpcolor_@GIMP_API_VERSION@_la_DEPENDENCIES = \
$(gimpcolor_def) \ $(gimpcolor_def) \
$(libgimpbase) $(libgimpbase)
libgimpcolor_2_0_la_LIBADD = \ libgimpcolor_@GIMP_API_VERSION@_la_LIBADD = \
$(GEGL_LIBS) \ $(GEGL_LIBS) \
$(CAIRO_LIBS) \ $(CAIRO_LIBS) \
$(GDK_PIXBUF_LIBS) \ $(GDK_PIXBUF_LIBS) \

13
libgimpconfig/Makefile.am
View file

@ -57,7 +57,7 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpconfig.def gimpconfig.def
lib_LTLIBRARIES = libgimpconfig-2.0.la lib_LTLIBRARIES = libgimpconfig-@GIMP_API_VERSION@.la
libgimpconfig_sources = \ libgimpconfig_sources = \
gimpconfig.h \ gimpconfig.h \
@ -86,8 +86,9 @@ libgimpconfig_sources = \
libgimpconfig_built_sources = \ libgimpconfig_built_sources = \
gimpcolorconfig-enums.c gimpcolorconfig-enums.c
libgimpconfig_2_0_la_SOURCES = \ libgimpconfig_@GIMP_API_VERSION@_la_SOURCES = \
$(libgimpconfig_sources) $(libgimpconfig_built_sources) $(libgimpconfig_sources) \
$(libgimpconfig_built_sources)
libgimpconfiginclude_HEADERS = \ libgimpconfiginclude_HEADERS = \
@ -106,14 +107,14 @@ libgimpconfiginclude_HEADERS = \
gimpcolorconfig-enums.h gimpcolorconfig-enums.h
libgimpconfig_2_0_la_LDFLAGS = \ libgimpconfig_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpconfig_export_symbols) $(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) \ $(libgimpbase) \
$(libgimpcolor) \ $(libgimpcolor) \
$(libgimpmath) \ $(libgimpmath) \

14
libgimpmath/Makefile.am
View file

@ -58,9 +58,9 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpmath.def 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 \ gimpmath.h \
gimpmathtypes.h \ gimpmathtypes.h \
gimpmatrix.c \ gimpmatrix.c \
@ -77,14 +77,18 @@ libgimpmathinclude_HEADERS = \
gimpmd5.h \ gimpmd5.h \
gimpvector.h gimpvector.h
libgimpmath_2_0_la_LDFLAGS = \ libgimpmath_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpmath_export_symbols) $(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 install-data-local: install-ms-lib install-libtool-import-lib

10
libgimpmodule/Makefile.am
View file

@ -54,9 +54,9 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpmodule.def 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 \ gimpmoduletypes.h \
gimpmodule.c \ gimpmodule.c \
gimpmodule.h \ gimpmodule.h \
@ -68,14 +68,14 @@ libgimpmoduleinclude_HEADERS = \
gimpmodule.h \ gimpmodule.h \
gimpmoduledb.h gimpmoduledb.h
libgimpmodule_2_0_la_LDFLAGS = \ libgimpmodule_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpmodule_export_symbols) $(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) \ $(libgimpbase) \
$(GMODULE_NO_EXPORT_LIBS) \ $(GMODULE_NO_EXPORT_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)

10
libgimpthumb/Makefile.am
View file

@ -52,9 +52,9 @@ INCLUDES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpthumb.def 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.h \
gimpthumb-enums.c \ gimpthumb-enums.c \
gimpthumb-enums.h \ gimpthumb-enums.h \
@ -74,12 +74,14 @@ libgimpthumbinclude_HEADERS = \
gimpthumb-utils.h \ gimpthumb-utils.h \
gimpthumbnail.h gimpthumbnail.h
libgimpthumb_2_0_la_LDFLAGS = \ libgimpthumb_@GIMP_API_VERSION@_la_LDFLAGS = \
-version-info $(LT_VERSION_INFO) \ -version-info $(LT_VERSION_INFO) \
$(no_undefined) \ $(no_undefined) \
$(libgimpthumb_export_symbols) $(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 noinst_PROGRAMS = gimp-thumbnail-list

24
libgimpwidgets/Makefile.am
View file

@ -58,9 +58,9 @@ INCLUDES = \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
-I$(includedir) -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.c \
gimpbrowser.h \ gimpbrowser.h \
gimpbutton.c \ gimpbutton.c \
@ -181,17 +181,17 @@ libgimpwidgets_2_0_la_sources = \
gimp3migration.c \ gimp3migration.c \
gimp3migration.h gimp3migration.h
libgimpwidgets_2_0_la_built_sources = \ libgimpwidgets_built_sources = \
gimp-wilber-pixbufs.h \ gimp-wilber-pixbufs.h \
gimpwidgetsenums.c \ gimpwidgetsenums.c \
gimpwidgetsmarshal.c \ gimpwidgetsmarshal.c \
gimpwidgetsmarshal.h gimpwidgetsmarshal.h
libgimpwidgets_2_0_la_extra_sources = gimpwidgetsmarshal.list libgimpwidgets_extra_sources = gimpwidgetsmarshal.list
libgimpwidgets_2_0_la_SOURCES = \ libgimpwidgets_@GIMP_API_VERSION@_la_SOURCES = \
$(libgimpwidgets_2_0_la_built_sources) \ $(libgimpwidgets_built_sources) \
$(libgimpwidgets_2_0_la_sources) $(libgimpwidgets_sources)
libgimpwidgetsinclude_HEADERS = \ libgimpwidgetsinclude_HEADERS = \
gimpbrowser.h \ gimpbrowser.h \
@ -253,12 +253,12 @@ libgimpwidgetsinclude_HEADERS = \
gimpzoommodel.h \ gimpzoommodel.h \
gimp3migration.h gimp3migration.h
libgimpwidgets_2_0_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_2_0_la_LIBADD = \ libgimpwidgets_@GIMP_API_VERSION@_la_LIBADD = \
$(libgimpcolor) \ $(libgimpcolor) \
$(libgimpconfig) \ $(libgimpconfig) \
$(libgimpbase) \ $(libgimpbase) \
@ -266,7 +266,7 @@ libgimpwidgets_2_0_la_LIBADD = \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(libm) $(libm)
libgimpwidgets_2_0_la_DEPENDENCIES = $(gimpwidgets_def) libgimpwidgets_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpwidgets_def)
## Wilber icons for the window managaer, compiled in ## Wilber icons for the window managaer, compiled in
@ -285,8 +285,8 @@ WILBER_VARIABLES = \
EXTRA_DIST = \ EXTRA_DIST = \
gimpwidgets.def \ gimpwidgets.def \
$(libgimpwidgets_2_0_la_extra_sources) \ $(libgimpwidgets_extra_sources) \
$(WILBER_IMAGES) $(WILBER_IMAGES)