diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-11-21 03:25:35 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-11-21 03:25:35 +0000 |
| commit | 1a5e888b636f993e79ce0faad2644023edba87a3 (patch) | |
| tree | 393c9fb33a6c6e6648fa08e9bcaead668f9af07d /gmodule | |
| parent | b99692c067a1da6e6197c5c48a6e33def60b0c70 (diff) | |
| download | glib-1a5e888b636f993e79ce0faad2644023edba87a3.tar.gz | |
Hardcode 2.0 in the names, as that is what Makefile.am does.
2002-11-21 Tor Lillqvist <tml@iki.fi>
* {glib,gmodule,gobject,gthread}/makefile.{mingw,msc}.in:
Hardcode 2.0 in the names, as that is what Makefile.am does.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/makefile.mingw.in | 8 | ||||
| -rw-r--r-- | gmodule/makefile.msc.in | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in index 7fcebc370..bc0e83b04 100644 --- a/gmodule/makefile.mingw.in +++ b/gmodule/makefile.mingw.in @@ -16,7 +16,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG all : \ gmoduleconf.h \ - libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a + libgmodule-2.0.a gmodule_OBJECTS = \ gmodule.o @@ -26,10 +26,10 @@ gmoduleconf.h: gmoduleconf.h.win32 ################ The gmodule DLL -libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.a : $(gmodule_OBJECTS) gmodule.def gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc - $(BUILD_DLL) gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ +libgmodule-2.0.a : $(gmodule_OBJECTS) gmodule.def gmodule-2.0.rc + $(BUILD_DLL) gmodule-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-2.0 -gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.rc : gmodule.rc +gmodule-2.0.rc : gmodule.rc cp $< $@ ################ Other stuff diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in index 58524a4b6..a81916974 100644 --- a/gmodule/makefile.msc.in +++ b/gmodule/makefile.msc.in @@ -12,7 +12,7 @@ DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" all : \ gmoduleconf.h \ - libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll + libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll gmodule_OBJECTS = \ gmodule.obj @@ -20,9 +20,9 @@ gmodule_OBJECTS = \ gmoduleconf.h: gmoduleconf.h.win32 copy gmoduleconf.h.win32 gmoduleconf.h -libgmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def +libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) \ - ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /implib:gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.lib /def:gmodule.def + ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def clean:: del gmoduleconf.h |