Add gwin32 object. Add rule to make .i (preprocessed source) files.

1999-11-04  Tor Lillqvist  <tml@iki.fi>

* makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
(preprocessed source) files.

diff --git a/ChangeLog b/ChangeLog
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3821edf..57e8c92 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+1999-11-04  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{cygwin,msc}.in: Add gwin32 object. Add rule to make .i
+       (preprocessed source) files.
+
 1999-11-01  Tor Lillqvist  <tml@iki.fi>
 
        * glib.h

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index ecf6e1c..99b45f3 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -81,7 +81,8 @@ glib_OBJECTS = \
        gstring.obj     \
        gstrfuncs.obj   \
        gscanner.obj    \
-       gutils.obj
+       gutils.obj      \
+       gwin32.obj
 
 glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
        $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
@@ -95,6 +96,9 @@ config.h: config.h.win32
 .c.obj :
        $(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
 
+.c.i :
+       $(CC) $(CFLAGS) -GD -E -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< >$@
+
 gmodule_OBJECTS = \
        gmodule.obj
 

diff --git a/makefile.cygwin.in b/makefile.cygwin.in
index 11435d0..c276292 100644 (file)
--- a/makefile.cygwin.in
+++ b/makefile.cygwin.in
@@ -74,7 +74,8 @@ glib_OBJECTS = \
        gstring.o       \
        gstrfuncs.o     \
        gscanner.o      \
-       gutils.o
+       gutils.o        \
+       gwin32.o
 
 glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
        ./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) -luser32 -lwsock32
@@ -85,9 +86,14 @@ glibconfig.h: glibconfig.h.win32
 config.h: config.h.win32
        $(CP) config.h.win32 config.h
 
+.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 $< >$@
+
 gmodule_OBJECTS = \
        gmodule.o
 

diff --git a/makefile.msc.in b/makefile.msc.in
index ecf6e1c..99b45f3 100644 (file)
--- a/makefile.msc.in
+++ b/makefile.msc.in
@@ -81,7 +81,8 @@ glib_OBJECTS = \
        gstring.obj     \
        gstrfuncs.obj   \
        gscanner.obj    \
-       gutils.obj
+       gutils.obj      \
+       gwin32.obj
 
 glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
        $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
@@ -95,6 +96,9 @@ config.h: config.h.win32
 .c.obj :
        $(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $<
 
+.c.i :
+       $(CC) $(CFLAGS) -GD -E -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< >$@
+
 gmodule_OBJECTS = \
        gmodule.obj