diff options
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/ChangeLog | 8 | ||||
| -rw-r--r-- | gobject/Makefile.am | 9 | ||||
| -rw-r--r-- | gobject/makefile.msc.in | 29 |
3 files changed, 27 insertions, 19 deletions
diff --git a/gobject/ChangeLog b/gobject/ChangeLog index f05e2f9e5..f6533c945 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,11 @@ +2001-09-25 Tor Lillqvist <tml@iki.fi> + + * Makefile.am: Use new macros for .def file, and check for + MS_LIB_AVAILABLE, new rule to build MS import library. + + * makefile.msc.in: Use same DLL and import library names as + libtool. + 2001-09-21 Hans Breuer <hans@breuer.org> * gobject.def : updated externals diff --git a/gobject/Makefile.am b/gobject/Makefile.am index b76b3c89e..1708392b8 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -17,6 +17,10 @@ libglib = $(top_builddir)/glib/libglib-1.3.la # libraries to compile and install lib_LTLIBRARIES = libgobject-1.3.la +if MS_LIB_AVAILABLE +noinst_DATA = gobject-1.3.lib +endif + if PLATFORM_WIN32 no_undefined = -no-undefined endif @@ -33,7 +37,7 @@ libgobject_1_3_la_LDFLAGS = @STRIP_BEGIN@ \ libgobject_1_3_la_LIBADD = @G_OBJECT_WIN32_RESOURCE@ $(libglib) -libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@ +libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@ @GOBJECT_DEF@ # # setup source file variables @@ -204,6 +208,9 @@ if OS_WIN32 $(top_srcdir)/build/win32/lt-compile-resource gobject.rc @G_OBJECT_WIN32_RESOURCE@ endif +gobject-1.3.lib: libgobject-1.3.la gobject.def + lib -name:libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gobject.def -out:$@ + gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in index f4186562a..731ed0612 100644 --- a/gobject/makefile.msc.in +++ b/gobject/makefile.msc.in @@ -23,12 +23,11 @@ all : \ gobject-query.exe \ gmarshal.h \ gmarshal.c \ - gobject-$(GLIB_VER).dll \ - gobject-$(GLIB_VER)s.lib + libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll \ + gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib gobject_OBJECTS = \ gboxed.obj \ - gbsearcharray.obj \ gclosure.obj \ genums.obj \ gobject.obj \ @@ -53,27 +52,21 @@ gmarshal.h : gmarshal.list glib-genmarshal.exe gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c -makefile.msc: makefile.msc.in - $(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \ - -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@ +libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def + $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \ + ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib $(LDFLAGS) /implib:gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gobject.def -gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def - $(CC) $(CFLAGS) -Fm -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) \ - ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def - -gobject-$(GLIB_VER)s.lib : $(gobject_OBJECTS) - lib /out:gobject-$(GLIB_VER)s.lib $(gobject_OBJECTS) +gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS) + lib /out:$@ $(gobject_OBJECTS) # link glib's static version to avoid installing -glib-genmarshal.exe : glib-genmarshal.c ..\glib\glib-$(GLIB_VER)s.lib gmarshal.strings +glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \ - ..\glib\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) + ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) -gobject-query.exe : gobject-query.c ..\glib\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).dll +gobject-query.exe : gobject-query.c libgobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \ - ..\glib\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) + ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) gmarshal.strings : gmarshal.list perl marshal-genstrings.pl > gmarshal.strings - - |