removed glib.def from EXTRA_DIST ... ... and added it here.

[platform/upstream/glib.git] / makefile.msc.in

diff --git a/makefile.msc.in b/makefile.msc.in
index 0bd252f..c336020 100644 (file)
--- a/makefile.msc.in
+++ b/makefile.msc.in
@@ -1,142 +1,26 @@
 ## Makefile for building the GLib dlls with Microsoft C
-## Use: nmake -f makefile.msc install
-
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH.
-BIN = C:\bin
+## Use: nmake -f makefile.msc
 
 TOP = ..
 
 !INCLUDE $(TOP)\build\win32\make.msc
 
-# Possibly override GLib version in build\win32\module.defs
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
-################################################################
-
-# Nothing much configurable below
-
-INCLUDES = -I .
-DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
-DEPCFLAGS = $(LIBICONV_CFLAGS)
-
-DLLS_TO_BUILD = \
-       glib-$(GLIB_VER).dll \
-       sub-gmodule \
-       sub-gthread \
-       sub-gobject
+PARTS = glib gmodule gthread gobject tests
 
 all : \
-       config.h        \
-       glibconfig.h    \
-       $(DLLS_TO_BUILD) \
-       testglib.exe    \
-       testgdate.exe   \
-       testgdateparser.exe
+       config.h \
+       sub-all
 
-install : all
-       copy glib-$(GLIB_VER).dll $(BIN)
+sub-all: 
+       for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
 
-glib_OBJECTS = \
-       garray.obj      \
-       gasyncqueue.obj \
-       gbacktrace.obj  \
-       gcache.obj      \
-       gcompletion.obj \
-       gdataset.obj    \
-       gdate.obj       \
-       gerror.obj      \
-       gconvert.obj    \
-       ghash.obj       \
-       ghook.obj       \
-       giochannel.obj  \
-       giowin32.obj    \
-       glist.obj       \
-       gmain.obj       \
-       gmem.obj        \
-       gmessages.obj   \
-       gnode.obj       \
-       gprimes.obj     \
-       gqueue.obj      \
-       grand.obj       \
-       grel.obj        \
-       gscanner.obj    \
-       gslist.obj      \
-       gstrfuncs.obj   \
-       gstring.obj     \
-       gthread.obj     \
-       gthreadpool.obj \
-       gtimer.obj      \
-       gtree.obj       \
-       gunidecomp.obj  \
-       guniprop.obj    \
-       gutf8.obj       \
-       gutils.obj      \
-       gwin32.obj
-
-glibconfig.h: glibconfig.h.win32
-       copy glibconfig.h.win32 glibconfig.h
+sub-one:
+       @cd $(THIS)
+       @nmake -nologo -f makefile.msc
+       @cd ..
 
 config.h: config.h.win32
        copy config.h.win32 config.h
 
-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 >$@
-
-################ glib
-
-glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
-       $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
-
-################ subdirectories
-
-sub-gmodule :
-       cd gmodule
-       -$(MAKE) -f makefile.msc all
-       cd ..
-
-sub-gthread :
-       cd gthread
-       -$(MAKE) -f makefile.msc all
-       cd ..
-
-sub-gobject :
-       cd gobject
-       -$(MAKE) -f makefile.msc all
-       cd ..
-
-################ test progs
-
-testglib.obj : testglib.c
-       $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testglib\" testglib.c
-
-testglib.exe : glib-$(GLIB_VER).dll testglib.obj
-       $(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
-
-testgdate.obj : testgdate.c
-       $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdate\" testgdate.c
-
-testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj
-       $(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
-
-testgdateparser.obj : testgdateparser.c
-       $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdateparser\" testgdateparser.c
-
-testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj
-       $(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
-
-################ other stuff
-
-clean::
-       del config.h
-       del glibconfig.h
-       cd gmodule
-       $(MAKE) -f makefile.msc clean
-       cd ..
-       cd gthread
-       $(MAKE) -f makefile.msc clean
-       cd ..
-       cd gobject
-       $(MAKE) -f makefile.msc clean
-       cd ..
+glibconfig.h: glibconfig.h.win32
+       copy glibconfig.h.win32 glibconfig.h