Commit a2f7750d authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Always provide interlibrary dependencies, not just on Win32.

2003-05-23  Michael Natterer  <mitch@gimp.org>

	* modules/Makefile.am: Always provide interlibrary
	dependencies, not just on Win32.

	* Makefile.am
	* app/Makefile.am
	* app/config/Makefile.am
	* data/misc/Makefile.am
	* docs/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am
	* libgimpcolor/Makefile.am
	* libgimpmath/Makefile.am
	* libgimpmodule/Makefile.am
	* libgimpwidgets/Makefile.am
	* tools/Makefile.am: replaced many hardcoded "1.3" strings by
	$(LT_RELEASE). Hopefully didn't break the Win32 build...
parent b63b1ff4
2003-05-23 Michael Natterer <mitch@gimp.org>
* modules/Makefile.am: Always provide interlibrary
dependencies, not just on Win32.
* Makefile.am
* app/Makefile.am
* app/config/Makefile.am
* data/misc/Makefile.am
* docs/Makefile.am
* libgimp/Makefile.am
* libgimpbase/Makefile.am
* libgimpcolor/Makefile.am
* libgimpmath/Makefile.am
* libgimpmodule/Makefile.am
* libgimpwidgets/Makefile.am
* tools/Makefile.am: replaced many hardcoded "1.3" strings by
$(LT_RELEASE). Hopefully didn't break the Win32 build...
2003-05-23 Sven Neumann <sven@gimp.org>
* app/paint/gimppaintcore.c
......@@ -25,12 +25,12 @@ SUBDIRS = \
docs \
devel-docs
bin_SCRIPTS = gimptool-1.3 @GIMPINSTALL@
bin_SCRIPTS = gimptool-$(LT_RELEASE) @GIMPINSTALL@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gimp-1.3.pc gimpui-1.3.pc
pkgconfig_DATA = gimp-$(LT_RELEASE).pc gimpui-$(LT_RELEASE).pc
EXTRA_SCRIPTS = gimpinstall-1.3
EXTRA_SCRIPTS = gimpinstall-$(LT_RELEASE)
EXTRA_DIST = \
AUTHORS \
......@@ -61,14 +61,14 @@ DISTCLEANFILES = \
intltool-update
gimpinstall-1.3:
$(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-1.3
gimpinstall-@LT_RELEASE@:
$(LN_S) $(srcdir)/install-sh $(srcdir)/gimpinstall-$(LT_RELEASE)
install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gimptool \
&& $(LN_S) gimptool-1.3 gimptool
&& $(LN_S) gimptool-$(LT_RELEASE) gimptool
endif
uninstall-local:
......
......@@ -109,7 +109,7 @@ install-exec-hook:
if DEFAULT_BINARY
cd $(DESTDIR)$(bindir) \
&& rm -f gimp$(EXEEXT) \
&& $(LN_S) gimp-1.3$(EXEEXT) gimp$(EXEEXT)
&& $(LN_S) gimp-$(LT_RELEASE)$(EXEEXT) gimp$(EXEEXT)
endif
uninstall-local:
......
......@@ -78,7 +78,7 @@ gimprc: gimpconfig-dump
./$< --system-gimprc > gimprc
man: gimpconfig-dump
./$< --man-page > gimprc-1.3.5.in
./$< --man-page > gimprc-$(LT_RELEASE).5.in
#
......@@ -92,7 +92,7 @@ test_config_DEPENDENCIES = $(gimpconfig_dependencies)
test_config_LDADD = $(GLIB_LIBS) $(gimpconfig_libs)
CLEANFILES = $(EXTRA_PROGRAMS) foorc gimprc gimprc-1.3.5.in
CLEANFILES = $(EXTRA_PROGRAMS) foorc gimprc gimprc-$(LT_RELEASE).5.in
#
......@@ -101,5 +101,5 @@ CLEANFILES = $(EXTRA_PROGRAMS) foorc gimprc gimprc-1.3.5.in
#
dist-hook: gimpconfig-dump
./$< --man-page > $(top_srcdir)/docs/gimprc-1.3.5.in
./$< --man-page > $(top_srcdir)/docs/gimprc-$(LT_RELEASE).5.in
./$< --system-gimprc > $(top_srcdir)/etc/gimprc
## Process this file with automake to produce Makefile.in
man_MANS = \
gimp-1.3.1 \
gimptool-1.3.1 \
gimprc-1.3.5 \
gimp-remote-1.3.1
gimp-$(LT_RELEASE).1 \
gimptool-$(LT_RELEASE).1 \
gimprc-$(LT_RELEASE).5 \
gimp-remote-$(LT_RELEASE).1
EXTRA_DIST = \
gimp-1.3.1.in \
gimprc-1.3.5.in \
gimptool-1.3.1.in \
gimp-remote-1.3.1.in \
gimp-$(LT_RELEASE).1.in \
gimprc-$(LT_RELEASE).5.in \
gimptool-$(LT_RELEASE).1.in \
gimp-remote-$(LT_RELEASE).1.in \
Wilber.svg \
Wilber.xcf.gz \
Wilber.xcf.gz.README \
......
## Process this file with automake to produce Makefile.in
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-1.3.la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-1.3.la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-1.3.la
libgimp = ./libgimp-1.3.la
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la
libgimp = ./libgimp-$(LT_RELEASE).la
if PLATFORM_WIN32
no_undefined = -no-undefined
......@@ -16,33 +16,33 @@ libgimp_export_symbols = -export-symbols gimp.def
libgimpui_export_symbols = -export-symbols gimpui.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimp-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpui-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimp-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpui-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimp-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpui-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimp-$(LT_RELEASE).dll.a
-rm $(DESTDIR)$(libdir)/libgimpui-$(LT_RELEASE).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimp-1.3.lib gimpui-1.3.lib
noinst_DATA = gimp-$(LT_RELEASE).lib gimpui-$(LT_RELEASE).lib
install-ms-lib:
$(INSTALL) gimp-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpui-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimp-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
$(INSTALL) gimpui-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimp-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpui-1.3.lib
-rm $(DESTDIR)$(libdir)/gimp-$(LT_RELEASE).lib
-rm $(DESTDIR)$(libdir)/gimpui-$(LT_RELEASE).lib
gimp-1.3.lib: gimp.def
lib -name:libgimp-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimp.def -out:$@
gimp-@LT_RELEASE@.lib: gimp.def
lib -name:libgimp-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimp.def -out:$@
gimpui-1.3.lib: gimpui.def
lib -name:libgimpui-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpui.def -out:$@
gimpui-@LT_RELEASE@.lib: gimpui.def
lib -name:libgimpui-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimpui.def -out:$@
else
install-ms-lib:
......
......@@ -9,26 +9,26 @@ gimpbase_def = gimpbase.def
libgimpbase_export_symbols = -export-symbols gimpbase.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimpbase-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpbase-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimpbase-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpbase-$(LT_RELEASE).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimpbase-1.3.lib
noinst_DATA = gimpbase-$(LT_RELEASE).lib
install-ms-lib:
$(INSTALL) gimpbase-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpbase-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimpbase-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpbase-$(LT_RELEASE).lib
gimpbase-1.3.lib: gimpbase.def
lib -name:libgimpbase-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpbase.def -out:$@
gimpbase-@LT_RELEASE@.lib: gimpbase.def
lib -name:libgimpbase-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimpbase.def -out:$@
else
install-ms-lib:
......
......@@ -14,26 +14,26 @@ gimpcolor_def = gimpcolor.def
libgimpcolor_export_symbols = -export-symbols gimpcolor.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimpcolor-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpcolor-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimpcolor-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpcolor-$(LT_RELEASE).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimpcolor-1.3.lib
noinst_DATA = gimpcolor-$(LT_RELEASE).lib
install-ms-lib:
$(INSTALL) gimpcolor-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpcolor-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimpcolor-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpcolor-$(LT_RELEASE).lib
gimpcolor-1.3.lib: gimpcolor.def
lib -name:libgimpcolor-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpcolor.def -out:$@
gimpcolor-@LT_RELEASE@.lib: gimpcolor.def
lib -name:libgimpcolor-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimpcolor.def -out:$@
else
install-ms-lib:
......
......@@ -14,26 +14,26 @@ gimpmath_def = gimpmath.def
libgimpmath_export_symbols = -export-symbols gimpmath.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimpmath-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpmath-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimpmath-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpmath-$(LT_RELEASE).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimpmath-1.3.lib
noinst_DATA = gimpmath-$(LT_RELEASE).lib
install-ms-lib:
$(INSTALL) gimpmath-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpmath-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimpmath-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpmath-$(LT_RELEASE).lib
gimpmath-1.3.lib: gimpmath.def
lib -name:libgimpmath-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpmath.def -out:$@
gimpmath-@LT_RELEASE@.lib: gimpmath.def
lib -name:libgimpmath-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimpmath.def -out:$@
else
install-ms-lib:
......
......@@ -9,26 +9,26 @@ gimpmodule_def = gimpmodule.def
libgimpmodule_export_symbols = -export-symbols gimpmodule.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimpmodule-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpmodule-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimpmodule-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpmodule-$(LT_RELEASE).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimpmodule-1.3.lib
noinst_DATA = gimpmodule-$(LT_RELEASE).lib
install-ms-lib:
$(INSTALL) gimpmodule-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpmodule-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimpmodule-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpmodule-$(LT_RELEASE).lib
gimpmodule-1.3.lib: gimpmodule.def
lib -name:libgimpmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpmodule.def -out:$@
gimpmodule-@LT_RELEASE@.lib: gimpmodule.def
lib -name:libgimpmodule-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimpmodule.def -out:$@
else
install-ms-lib:
......
## Process this file with automake to produce Makefile.in
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-1.3.la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la
if PLATFORM_WIN32
no_undefined = -no-undefined
......@@ -16,26 +16,26 @@ gimpwidgets_def = gimpwidgets.def
libgimpwidgets_export_symbols = -export-symbols gimpwidgets.def
install-libtool-import-lib:
$(INSTALL) .libs/libgimpwidgets-1.3.dll.a $(DESTDIR)$(libdir)
$(INSTALL) .libs/libgimpwidgets-$(LT_RELEASE).dll.a $(DESTDIR)$(libdir)
uninstall-libtool-import-lib:
-rm $(DESTDIR)$(libdir)/libgimpwidgets-1.3.dll.a
-rm $(DESTDIR)$(libdir)/libgimpwidgets-$(LT_RELEASE).dll.a
else
install-libtool-import-lib:
uninstall-libtool-import-lib:
endif
if MS_LIB_AVAILABLE
noinst_DATA = gimpwidgets-1.3.lib
noinst_DATA = gimpwidgets-$(LT_RELEASE).lib
install-ms-lib:
$(INSTALL) gimpwidgets-1.3.lib $(DESTDIR)$(libdir)
$(INSTALL) gimpwidgets-$(LT_RELEASE).lib $(DESTDIR)$(libdir)
uninstall-ms-lib:
-rm $(DESTDIR)$(libdir)/gimpwidgets-1.3.lib
-rm $(DESTDIR)$(libdir)/gimpwidgets-$(LT_RELEASE).lib
gimpwidgets-1.3.lib: gimpwidgets.def
lib -name:libgimpwidgets-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpwidgets.def -out:$@
gimpwidgets-@LT_RELEASE@.lib: gimpwidgets.def
lib -name:libgimpwidgets-$(LT_RELEASE)-@LT_CURRENT_MINUS_AGE@.dll -def:gimpwidgets.def -out:$@
else
install-ms-lib:
......
## Process this file with automake to produce Makefile.in
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(LT_RELEASE).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(LT_RELEASE).la
if OS_WIN32
no_undefined = -no-undefined
conditional_libgimpbase_la = ../libgimpbase/libgimpbase-1.3.la
conditional_libgimpcolor_la = ../libgimpcolor/libgimpcolor-1.3.la
conditional_libgimpwidgets_la = ../libgimpwidgets/libgimpwidgets-1.3.la
endif
libdir = $(gimpplugindir)/modules
......@@ -24,24 +25,22 @@ lib_LTLIBRARIES = \
libcdisplay_gamma.la \
libcdisplay_highcontrast.la
EXTRA_LTLIBRARIES =
libcolorsel_triangle_la_SOURCES = colorsel_triangle.c
libcolorsel_triangle_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcolorsel_triangle_la_LIBADD = $(conditional_libgimpcolor_la) $(conditional_libgimpwidgets_la) $(GTK_LIBS)
libcolorsel_triangle_la_LIBADD = $(libgimpcolor) $(libgimpwidgets) $(GTK_LIBS)
libcolorsel_water_la_SOURCES = colorsel_water.c
libcolorsel_water_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcolorsel_water_la_LIBADD = $(conditional_libgimpcolor_la) $(conditional_libgimpwidgets_la) $(GTK_LIBS)
libcolorsel_water_la_LIBADD = $(libgimpcolor) $(libgimpwidgets) $(GTK_LIBS)
libcdisplay_colorblind_la_SOURCES = cdisplay_colorblind.c
libcdisplay_colorblind_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcdisplay_colorblind_la_LIBADD = $(conditional_libgimpbase_la) $(conditional_libgimpwidgets_la) $(GTK_LIBS)
libcdisplay_colorblind_la_LIBADD = $(libgimpbase) $(libgimpwidgets) $(GTK_LIBS)
libcdisplay_gamma_la_SOURCES = cdisplay_gamma.c
libcdisplay_gamma_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcdisplay_gamma_la_LIBADD = $(conditional_libgimpbase_la) $(conditional_libgimpwidgets_la) $(GTK_LIBS)
libcdisplay_gamma_la_LIBADD = $(libgimpbase) $(libgimpwidgets) $(GTK_LIBS)
libcdisplay_highcontrast_la_SOURCES = cdisplay_highcontrast.c
libcdisplay_highcontrast_la_LDFLAGS = -avoid-version -module $(no_undefined)
libcdisplay_highcontrast_la_LIBADD = $(conditional_libgimpbase_la) $(conditional_libgimpwidgets_la) $(GTK_LIBS)
libcdisplay_highcontrast_la_LIBADD = $(libgimpbase) $(libgimpwidgets) $(GTK_LIBS)
......@@ -40,13 +40,13 @@ EXTRA_DIST = \
install-exec-hook:
if DEFAULT_BINARY
if test -f "$(DESTDIR)$(bindir)/gimp-remote-1.3"; then \
if test -f "$(DESTDIR)$(bindir)/gimp-remote-$(LT_RELEASE)"; then \
echo "cd $(DESTDIR)$(bindir)"; \
cd $(DESTDIR)$(bindir); \
echo "rm -f gimp-remote"; \
rm -f gimp-remote; \
echo "$(LN_S) gimp-remote-1.3 gimp-remote"; \
$(LN_S) gimp-remote-1.3 gimp-remote; \
echo "$(LN_S) gimp-remote-$(LT_RELEASE) gimp-remote"; \
$(LN_S) gimp-remote-$(LT_RELEASE) gimp-remote; \
fi
endif
......
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