makefile.cygwin.in Include the common makefile snippet from

2000-05-04  Tor Lillqvist  <tml@iki.fi>

* makefile.cygwin.in
* tests/makefile.cygwin.in: Include the common makefile snippet
from ../build/win32.

Maybe CVSROOT/modules should be changed so that the 'build' module
is included within the glib module (and gtk+, and gimp, and maybe
others later), in the same way as the 'macros' module is included
in lots of GNOME CVS modules?

diff --git a/ChangeLog b/ChangeLog
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a453f7b..ca484e2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2000-05-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.cygwin.in
+       * tests/makefile.cygwin.in: Include the common makefile snippet
+       from ../build/win32.
+
+       Maybe CVSROOT/modules should be changed so that the 'build' module
+       is included within the glib module (and gtk+, and gimp, and maybe
+       others later), in the same way as the 'macros' module is included
+       in lots of GNOME CVS modules?
+
 2000-05-02  Tor Lillqvist  <tml@iki.fi>
 
        * glib.def: Add new functions.

diff --git a/makefile.cygwin.in b/makefile.cygwin.in
index d8bdf85..c5f9f2b 100644 (file)
--- a/makefile.cygwin.in
+++ b/makefile.cygwin.in
@@ -1,5 +1,5 @@
 ## Makefile for building the GLib, gmodule and gthread DLLs with
-## gcc on cygwin or mingw32.
+## gcc on mingw or cygwin.
 ## Use: make -f makefile.cygwin install
 
 # Change this to wherever you want to install the DLLs. This directory
@@ -15,23 +15,21 @@ PTHREAD_INC = -I $(PTHREADS)
 
 OPTIMIZE = -g -O
 
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
+
+TOP = ..
+
+include $(TOP)/build/win32/make.mingw
+
 ################################################################
 
 # Nothing much configurable below
 
-CC = gcc -mno-cygwin -mpentium -fnative-struct
-
 DLLTOOL = dlltool
 INSTALL = install
 
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
-
-CFLAGS = $(OPTIMIZE) -I. -DHAVE_CONFIG_H
-
-# Kludge to get the path to the win32 headers. Should work for both
-# gcc running on cygwin, and bare mingw gcc, even if the make is
-# running on cygwin (whew).
-WIN32APIHEADERS = $(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's![\\/]winver.h!!' | tr -d '\015')
+INCLUDES = -I .
+DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
 
 all : \
        config.h        \
@@ -179,9 +177,6 @@ gthread-impl.o : gthread/gthread-impl.c gthread/gthread-posix.c
 testglib.exe : glib-$(GLIB_VER).dll testglib.o
        $(CC) $(CFLAGS) -o testglib testglib.o -L. -lglib-$(GLIB_VER) $(LDFLAGS)
 
-testglib.o : testglib.c
-       $(CC) -c $(CFLAGS) testglib.c
-
 testgdate.exe : glib-$(GLIB_VER).dll testgdate.o
        $(CC) $(CFLAGS) -o testgdate.exe testgdate.o -L. -lglib-$(GLIB_VER) $(LDFLAGS)
 
@@ -221,15 +216,5 @@ libgplugin_b.o : gmodule/libgplugin_b.c
 
 ################ other stuff
 
-clean:
+clean::
        -rm config.h glibconfig.h gmodule/gmoduleconf.h
-       -rm *.exe *.o *.dll *.a *.base *.exp
-
-.SUFFIXES: .c .o .i
-
-.c.o :
-       $(CC) $(CFLAGS) -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
-
-.c.i :
-       $(CC) $(CFLAGS) -E -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< >$@
-

diff --git a/tests/makefile.cygwin.in b/tests/makefile.cygwin.in
index 90fc116..bfae543 100644 (file)
--- a/tests/makefile.cygwin.in
+++ b/tests/makefile.cygwin.in
@@ -1,17 +1,20 @@
-## Makefile for building the GLib test programs with egcs on cygwin.
+## Makefile for building the GLib test programs with gcc on mingw or cygwin.
 ## Use: make -f makefile.cygwin check
 
 OPTIMIZE = -g -O
 
-################################################################
+GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
-# Nothing much configurable below
+TOP = ../..
 
-CC = gcc -mno-cygwin -mpentium -fnative-struct
+include $(TOP)/build/win32/make.mingw
 
-GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
+################################################################
+
+# Nothing much configurable below
 
-CFLAGS = $(OPTIMIZE) -I.. -DHAVE_CONFIG_H
+INCLUDES = -I .. 
+DEFINES = -DHAVE_CONFIG_H
 
 TESTS = \
        array-test.exe  \
@@ -31,16 +34,16 @@ TESTS = \
        tree-test.exe   \
        type-test.exe
 
-all :  $(TESTS)
+all:   $(TESTS)
 
 .SUFFIXES: .c .exe
 
-.c.exe :
+.c.exe:
        $(CC) $(CFLAGS) -c $<
        $(CC) $(CFLAGS) -o $@ $< -L.. -lglib-$(GLIB_VER) -lgthread-$(GLIB_VER)
 
 check: all
        @for P in $(TESTS) ; do echo $$P; ./$$P; done
 
-clean:
+clean::
        -rm *.exe *.o