From ae07ec5709fa90e2d3cab8617b2a3ca4a6bc8877 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 29 Mar 2002 23:24:42 +0000 Subject: [PATCH] Additions for Win32: Use -no-undefined. Use the .def file. Produce MS 2002-03-30 Tor Lillqvist * libgimpcolor/Makefile.am: Additions for Win32: Use -no-undefined. Use the .def file. Produce MS style import library if possible. Install (and uninstall) import libraries. * libgimpcolor/makefile.mingw.in: Add comment that it is seriously out-of-date. --- ChangeLog | 12 +++++--- libgimpcolor/.cvsignore | 2 ++ libgimpcolor/Makefile.am | 50 +++++++++++++++++++++++++++++++++- libgimpcolor/makefile.mingw.in | 12 +++++++- 4 files changed, 70 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e21c949745..fd88036fa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,12 @@ 2002-03-30 Tor Lillqvist - * libgimpbase/Makefile.am: Additions for Win32: Use - -no-undefined. Use the gimpbase.def file. Produce MS style import + * libgimpbase/Makefile.am + * libgimpcolor/Makefile.am: Additions for Win32: Use + -no-undefined. Use the .def file. Produce MS style import library if possible. Install (and uninstall) import - libraries. Pass definition of PREFIX in CPPFLAGS. + libraries. + + * libgimpbase/Makefile.am: Pass definition of PREFIX in CPPFLAGS. * libgimpbase/gimpbase.def: Do export gimp_signal_private. @@ -25,7 +28,8 @@ call g_error(), thus requiring that calls of this are enclosed with #ifdef G_OS_UNIX? - * libgimpbase/makefile.mingw.in: Add comment that it is seriously + * libgimpbase/makefile.mingw.in + * libgimpcolor/makefile.mingw.in: Add comment that it is seriously out-of-date. * libgimpbase/makefile.msc: Do compile gimpsignal.c. diff --git a/libgimpcolor/.cvsignore b/libgimpcolor/.cvsignore index 42de370d9b..0b61e7e470 100644 --- a/libgimpcolor/.cvsignore +++ b/libgimpcolor/.cvsignore @@ -6,3 +6,5 @@ _libs .libs .deps *.la +*.lib +*.exp diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am index 6a1fe23b29..925ea8fc66 100644 --- a/libgimpcolor/Makefile.am +++ b/libgimpcolor/Makefile.am @@ -1,5 +1,45 @@ ## Process this file with automake to produce Makefile.in +if PLATFORM_WIN32 +no_undefined = -no-undefined +endif + +if PLATFORM_WIN32 +else +libm = -lm +endif + +if OS_WIN32 +gimpcolor_def = gimpcolor.def +libgimpcolor_export_symbols = -export-symbols gimpcolor.def + +install-libtool-import-lib: + $(INSTALL) .libs/libgimpcolor-1.3.dll.a $(DESTDIR)$(libdir) + +uninstall-libtool-import-lib: + -rm $(DESTDIR)$(libdir)/libgimpcolor-1.3.dll.a +else +install-libtool-import-lib: +uninstall-libtool-import-lib: +endif + +if MS_LIB_AVAILABLE +noinst_DATA = gimpcolor-1.3.lib + +install-ms-lib: + $(INSTALL) gimpcolor-1.3.lib $(DESTDIR)$(libdir) + +uninstall-ms-lib: + -rm $(DESTDIR)$(libdir)/gimpcolor-1.3.lib + +gimpcolor-1.3.lib: gimpcolor.def + lib -name:libgimpcolor-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gimpcolor.def -out:$@ + +else +install-ms-lib: +uninstall-ms-lib: +endif + libgimpcolorincludedir = $(includedir)/gimp-$(LT_RELEASE)/libgimpcolor AM_CPPFLAGS = @STRIP_BEGIN@ \ @@ -53,6 +93,14 @@ EXTRA_HEADERS = libgimpcolor_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + $(no_undefined) \ + $(libgimpcolor_export_symbols) \ @STRIP_END@ -libgimpcolor_1_3_la_LIBADD = $(GLIB_LIBS) -lm +libgimpcolor_1_3_la_LIBADD = $(GLIB_LIBS) $(libm) + +libgimpcolor_1_3_la_DEPENDENCIES = $(gimpcolor_def) + +install-data-local: install-ms-lib install-libtool-import-lib + +uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib diff --git a/libgimpcolor/makefile.mingw.in b/libgimpcolor/makefile.mingw.in index 53ac9fcab5..88cdf9fb32 100644 --- a/libgimpcolor/makefile.mingw.in +++ b/libgimpcolor/makefile.mingw.in @@ -1,4 +1,14 @@ -## Makefile for building the GIMP DLLs and LIBs with gcc on Win32. +################################ +# +# Seriously out-of-date. Only Unix-style build supported now for gcc on Win32. +# +################################ + + + + + +## Makefile for building the GIMP DLLs and libs with gcc on Win32. ## You should use GNU make running on cygwin. ## Use: make -f makefile.mingw