From 256ba23b98b1c700dc7ba8314103b9c6786be678 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 5 Nov 2006 15:42:42 +0000 Subject: [PATCH] makefile.mingw gmodule/makefile.mingw.in glib/makefile.mingw.in 2006-11-05 Tor Lillqvist * makefile.mingw * gmodule/makefile.mingw.in * glib/makefile.mingw.in * gobject/makefile.mingw.in * gthread/makefile.mingw.in * tests/makefile.mingw.in: Remove from CVS. Haven't been maintained or distributed for long. --- ChangeLog | 10 +++++ glib/makefile.mingw.in | 91 --------------------------------------- gmodule/makefile.mingw.in | 38 ---------------- gobject/makefile.mingw.in | 83 ----------------------------------- gthread/makefile.mingw.in | 25 ----------- makefile.mingw | 12 ------ tests/makefile.mingw.in | 76 -------------------------------- 7 files changed, 10 insertions(+), 325 deletions(-) delete mode 100644 glib/makefile.mingw.in delete mode 100644 gmodule/makefile.mingw.in delete mode 100644 gobject/makefile.mingw.in delete mode 100644 gthread/makefile.mingw.in delete mode 100644 makefile.mingw delete mode 100644 tests/makefile.mingw.in diff --git a/ChangeLog b/ChangeLog index c81087aa6..1c9afc573 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-11-05 Tor Lillqvist + + * makefile.mingw + * gmodule/makefile.mingw.in + * glib/makefile.mingw.in + * gobject/makefile.mingw.in + * gthread/makefile.mingw.in + * tests/makefile.mingw.in: Remove from CVS. Haven't been + maintained or distributed for long. + 2006-10-26 Pascal Terjan * glib/libcharset/localcharset.c: Fix small leak on failed diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in deleted file mode 100644 index ecf5a52c3..000000000 --- a/glib/makefile.mingw.in +++ /dev/null @@ -1,91 +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 - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I . -I .. -DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=\"GLib\" -DG_ENABLE_DEBUG -DDLL_EXPORT -DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS) - -all : \ - ../config.h \ - ../glibconfig.h \ - libglib-2.0.a \ - gspawn-win32-helper.exe - -glib_OBJECTS = \ - garray.o \ - gasyncqueue.o \ - gbacktrace.o \ - gbookmarkfile.o \ - gbsearcharray.o \ - gcache.o \ - gcompletion.o \ - gconvert.o \ - gdataset.o \ - gdate.o \ - gdir.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 \ - gunicollate.o \ - gunidecomp.o \ - guniprop.o \ - gutf8.o \ - gutils.o \ - gwin32.o \ - localcharset.o - -../glibconfig.h: ../glibconfig.h.win32 - cp $< $@ - -../config.h: ../config.h.win32 - cp $< $@ - -localcharset.c : libcharset/localcharset.c - cp $< $@ - -################ The glib DLL - -libglib-2.0.a : $(glib_OBJECTS) glib.def glib-2.0.rc - $(BUILD_DLL) glib-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32 - -glib-2.0.rc : glib.rc - cp $< $@ - -gspawn-win32-helper.exe : gspawn-win32-helper.c - $(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-2.0 diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in deleted file mode 100644 index bc0e83b04..000000000 --- a/gmodule/makefile.mingw.in +++ /dev/null @@ -1,38 +0,0 @@ -## Makefile for building the gmodule DLL with gcc for mingw. The build -## uses tools running on cygwin, however. - -## Use: make -f makefile.mingw - -TOP = ../.. - -include ../build/win32/make.mingw - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I .. -I ../glib -I . -DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG - -all : \ - gmoduleconf.h \ - libgmodule-2.0.a - -gmodule_OBJECTS = \ - gmodule.o - -gmoduleconf.h: gmoduleconf.h.win32 - cp $< $@ - -################ The gmodule DLL - -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-2.0.rc : gmodule.rc - cp $< $@ - -################ Other stuff - -clean:: - -rm gmoduleconf.h diff --git a/gobject/makefile.mingw.in b/gobject/makefile.mingw.in deleted file mode 100644 index 27a684d5b..000000000 --- a/gobject/makefile.mingw.in +++ /dev/null @@ -1,83 +0,0 @@ -## Makefile for building the gobject DLL with gcc for mingw. The build -## uses tools running on cygwin, however. - -## Use: make -f makefile.mingw - -TOP = ../.. - -include ../build/win32/make.mingw - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I .. -I ../glib -I . -DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"GLib-GObject\" -DG_ENABLE_DEBUG - -srcdir=. - -all : \ - libgobject-2.0.a \ - testgobject.exe \ - glib-genmarshal.exe - -gobject_OBJECTS = \ - gboxed.o \ - gclosure.o \ - genums.o \ - gobject.o \ - gparam.o \ - gparamspecs.o \ - gsignal.o \ - gsourceclosure.o \ - gtype.o \ - gtypemodule.o \ - gtypeplugin.o \ - gvalue.o \ - gvaluearray.o \ - gvaluetransform.o \ - gvaluetypes.o - -libgobject-2.0.a : $(srcdir)/stamp-gmarshal.h gmarshal.c $(gobject_OBJECTS) gobject.def gobject-2.0.rc - $(BUILD_DLL) gobject-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gobject.def $(gobject_OBJECTS) -L ../glib -lglib-2.0 - -glib-genmarshal.exe : glib-genmarshal.c - $(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION $< -L ../glib -lglib-2.0 - -testgobject.exe: libgobject-2.0.a testgobject.o - $(CC) $(CFLAGS) -o testgobject.exe testgobject.o -L ../glib -lglib-2.0 -L . -lgobject-2.0 $(LFLAGS) - -gobject-2.0.rc : gobject.rc - cp $< $@ - -# Copied from Makefile.am: -# initial creation of the real stamp-* files -gmarshal.h: # never add deps here - test -f "$(srcdir)/$@" || touch $(srcdir)/$@ -# normal autogeneration rules -# all autogenerated files need to be generated in the srcdir, -# so old versions get remade and are not confused with newer -# versions in the build dir. thus a development setup requires -# srcdir to be writable, passing --disable-rebuilds to -# ../configure will supress all autogeneration rules. -$(srcdir)/stamp-gmarshal.h: @REBUILD@ gmarshal.list gmarshal.h glib-genmarshal.exe - echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \ - && echo "#define __G_MARSHAL_H__" >> xgen-gmh \ - && PATH=../glib:$$PATH ./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --header >> xgen-gmh \ - && echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \ - && (cmp -s xgen-gmh $(srcdir)/gmarshal.h || cp xgen-gmh $(srcdir)/gmarshal.h) \ - && rm -f xgen-gmh xgen-gmh~ \ - && echo timestamp > $@ -$(srcdir)/gmarshal.c: @REBUILD@ $(srcdir)/stamp-gmarshal.h - PATH=../glib:$$PATH ./glib-genmarshal --nostdinc --prefix=g_cclosure_marshal $(srcdir)/gmarshal.list --body >> xgen-gmc \ - && cp xgen-gmc $(srcdir)/gmarshal.c \ - && rm -f xgen-gmc xgen-gmc~ -$(srcdir)/gmarshal.strings: @REBUILD@ $(srcdir)/gmarshal.list - grep '^[A-Z]' $(srcdir)/gmarshal.list \ - | sed -e 's/^/"g_cclosure_marshal_/' -e 's/:/__/' -e 's/,/_/g' -e 's/$$/",/' > xgen-gms \ - && cp xgen-gms $(srcdir)/gmarshal.strings \ - && rm -f xgen-gms xgen-gms~ -glib-genmarshal.o: gmarshal.strings - -clean:: - -rm gmarshal.h gmarshal.c stamp-gmarshal.h diff --git a/gthread/makefile.mingw.in b/gthread/makefile.mingw.in deleted file mode 100644 index 5d0cf8bb4..000000000 --- a/gthread/makefile.mingw.in +++ /dev/null @@ -1,25 +0,0 @@ -## Makefile for building the gthread DLL with gcc for mingw. The build -## uses tools running on cygwin, however. - -## Use: make -f makefile.mingw - -TOP = ../.. - -include ../build/win32/make.mingw - -################################################################ - -INCLUDES = -I .. -I ../glib -I . -DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" -DG_ENABLE_DEBUG - -all : \ - libgthread-2.0.a - -gthread_OBJECTS = \ - gthread-impl.o - -libgthread-2.0.a : $(gthread_OBJECTS) gthread.def gthread-2.0.rc - $(BUILD_DLL) gthread-2.0 @LT_CURRENT@:@LT_REVISION@:@LT_AGE@ gthread.def $(gthread_OBJECTS) -L ../glib -lglib-2.0 - -gthread-2.0.rc : gthread.rc - cp $< $@ diff --git a/makefile.mingw b/makefile.mingw deleted file mode 100644 index b371151f1..000000000 --- a/makefile.mingw +++ /dev/null @@ -1,12 +0,0 @@ -## Makefile for building the GLib DLLs with gcc for mingw. The build -## uses tools running on cygwin, however. - -## Use: make -f makefile.mingw - -PARTS=glib gmodule gthread gobject tests - -all : - for D in $(PARTS); do (cd $$D && $(MAKE) -f makefile.mingw all); done - -clean : - for D in $(PARTS); do (cd $$D && $(MAKE) -f makefile.mingw clean); done diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in deleted file mode 100644 index ed9a791cf..000000000 --- a/tests/makefile.mingw.in +++ /dev/null @@ -1,76 +0,0 @@ -## Makefile for building the GLib test programs with gcc for mingw. -## Use: make -f makefile.mingw check - -TOP = ../.. - -include ../build/win32/make.mingw - -################################################################ - -# Nothing much configurable below - -INCLUDES = -I .. -I ../glib -I ../gmodule -DEFINES = -DHAVE_CONFIG_H - -NONAUTOMATIC_TESTS = \ - testglib.exe \ - testgdate.exe \ - testgdateparser.exe \ - patterntest.exe \ - unicode-normalize.exe \ - unicode-collate.exe - -TESTS = \ - array-test.exe \ - date-test.exe \ - dirname-test.exe\ - gio-test.exe \ - hash-test.exe \ - list-test.exe \ - mainloop-test.exe \ - markup-test.exe \ - module-test.exe \ - node-test.exe \ - queue-test.exe \ - rand-test.exe \ - relation-test.exe\ - shell-test.exe \ - slist-test.exe \ - spawn-test.exe \ - strfunc-test.exe\ - string-test.exe \ - strtod-test.exe \ - thread-test.exe \ - threadpool-test.exe\ - tree-test.exe \ - type-test.exe \ - unicode-caseconv.exe \ - unicode-encoding.exe - -DLLS = \ - libmoduletestplugin_a.dll \ - libmoduletestplugin_b.dll - -all: $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS) - -.SUFFIXES: .c .i .exe - -.c.exe: - $(CC) $(CFLAGS) -o $@ $< -L ../gthread -lgthread-2.0 -L ../glib -lglib-2.0 - -module-test.exe : module-test.o - $(CC) $(CFLAGS) -Wl,--base-file,module-test.base -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) - $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o - $(CC) $(CFLAGS) -Wl,--base-file,module-test.base,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) - $(DLLTOOL) --base-file module-test.base --output-exp module-test.exp module-test.o - $(CC) $(CFLAGS) -Wl,module-test.exp -o module-test.exe module-test.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 $(LDFLAGS) - -libmoduletestplugin_a.dll : libmoduletestplugin_a.o - $(BUILD_DLL) libmoduletestplugin_a - libmoduletestplugin_a.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 - -libmoduletestplugin_b.dll : libmoduletestplugin_b.o - $(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-2.0 -L ../gmodule -lgmodule-2.0 - -check: all - @for P in $(TESTS) ; do echo $$P; PATH=../glib:../gmodule:../gobject:../gthread:$$PATH ./$$P; done - @echo All tests successful. -- GitLab