After being away for about five months, I'm back working on this... For

2001-08-30  Tor Lillqvist  <tml@iki.fi>

	After being away for about five months, I'm back working on
	this...  For now, still using same build setup for Win32. Probably
	will change to not including version numbers in the import library
	names, though. (But the DLL names would still include them,
	possibly even also the micro version number.) That would be more
	Unix-like. Also, will have to check out newest mingw tool versions
	to see if the build-dll script now can be retired.

	* makefile.mingw
	* makefile.msc: New files, no need to generate from .in as
	they don't contain references to automake variables.

	* makefile.mingw.in
	* makefile.msc.in: Removed.

	* glib.rc.in: Remove
	* glib/glib.rc.in: Moved here.

	* Makefile.am
	* glib/Makefile.am: Corresponding changes.

	* glib/glib.def: Fix typo, add new entries.

	* glib/gspawn-win32-helper.c: More debugging. Doesn't work
	currently (or then it never has on Win2k, which I now use?)

	* glib/gstrfuncs.c
	* glib/gstrfuncs.h: Mark g_ascii_table for export/import on Win32.

	* */makefile.mingw.in: Reflect new location of glib library.

1 files changed, 0 insertions, 135 deletions

diff --git a/makefile.mingw.in b/makefile.mingw.in
deleted file mode 100644
index 0322d79e0..000000000
--- a/makefile.mingw.in
+++ /dev/null
@@ -1,135 +0,0 @@
-## Makefile for building the GLib DLL with gcc for mingw. The build
-## uses tools running on cygwin, however.
-
-## Use: make -f makefile.mingw
-
-TOP = ..
-
-include build/win32/make.mingw
-
-# 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 -DG_ENABLE_DEBUG -DDLL_EXPORT
-DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
-
-DLLS_TO_BUILD =				\
-	glib-$(GLIB_VER).dll		\
-	sub-gmodule			\
-	sub-gthread			\
-	sub-gobject
-
-all :				\
-	config.h		\
-	glibconfig.h		\
-	$(DLLS_TO_BUILD)	\
-	gspawn-win32-helper.exe	\
-	testglib.exe		\
-	testgdate.exe		\
-	testgdateparser.exe
-
-glib_OBJECTS =			\
-	garray.o		\
-	gasyncqueue.o		\
-	gbacktrace.o		\
-	gcache.o		\
-	gcompletion.o		\
-	gconvert.o		\
-	gdataset.o		\
-	gdate.o			\
-	gerror.o		\
-	gfileutils.o		\
-	ghash.o			\
-	ghook.o			\
-	giochannel.o		\
-	giowin32.o		\
-	glist.o			\
-	gmain.o			\
-	gmarkup.o		\
-	gmem.o			\
-	gmessages.o		\
-	gnode.o			\
-	gpattern.o		\
-	gprimes.o		\
-	gqsort.o		\
-	gqueue.o		\
-	grand.o			\
-	grel.o			\
-	gscanner.o		\
-	gshell.o		\
-	gslist.o		\
-	gspawn-win32.o		\
-	gstrfuncs.o		\
-	gstring.o		\
-	gthread.o		\
-	gthreadpool.o		\
-	gtimer.o		\
-	gtree.o			\
-	gunibreak.o		\
-	gunidecomp.o		\
-	guniprop.o		\
-	gutf8.o			\
-	gutils.o		\
-	gwin32.o
-
-glibconfig.h: glibconfig.h.win32
-	cp $< $@
-
-config.h: config.h.win32
-	cp $< $@
-
-ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
-makefile.mingw: makefile.mingw.in
-	sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \
-	    -e 's,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@,' <$< >$@
-endif
-
-################ glib
-
-glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
-	./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32
-
-gspawn-win32-helper.exe : gspawn-win32-helper.c
-	$(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-$(GLIB_VER)
-
-################ subdirectories
-
-sub-gmodule :
-	cd gmodule && $(MAKE) -f makefile.mingw all
-
-sub-gthread :
-	cd gthread && $(MAKE) -f makefile.mingw all
-
-sub-gobject :
-	cd gobject && $(MAKE) -f makefile.mingw all
-
-################ test progs
-
-testglib.o : testglib.c
-	$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testglib\" $<
-
-testglib.exe : glib-$(GLIB_VER).dll testglib.o
-	$(CC) $(CFLAGS) -o testglib testglib.o -L . -lglib-$(GLIB_VER) $(LDFLAGS)
-
-testgdate.o : testgdate.c
-	$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdate\" $<
-
-testgdate.exe : glib-$(GLIB_VER).dll testgdate.o
-	$(CC) $(CFLAGS) -o testgdate.exe testgdate.o -L . -lglib-$(GLIB_VER) $(LDFLAGS)
-
-testgdateparser.o : testgdateparser.c
-	$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdateparser\" $<
-
-testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.o
-	$(CC) $(CFLAGS) -o testgdateparser.exe testgdateparser.o -L . -lglib-$(GLIB_VER) $(LDFLAGS)
-
-
-################ other stuff
-
-clean::
-	-rm config.h glibconfig.h gmodule/gmoduleconf.h