Move to corresponding subdirectories.

2000-02-07  Tor Lillqvist  <tml@iki.fi>

* gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.

* Makefile.am
* gmodule/Makefile.am
* gthread/Makefile.am: Change accordingly.

* makefile.cygwin: Corresponding changes, some cleanup.

diff --git a/ChangeLog b/ChangeLog
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 56bd016..aeb9327 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2000-02-07  Tor Lillqvist  <tml@iki.fi>
+
+       * gmodule.rc.in gthread.rc.in: Move to corresponding subdirectories.
+
+       * Makefile.am
+       * gmodule/Makefile.am
+       * gthread/Makefile.am: Change accordingly.
+       
+       * makefile.cygwin: Corresponding changes, some cleanup.
+
 2000-02-05  Tor Lillqvist  <tml@iki.fi>
 
        * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting

diff --git a/Makefile.am b/Makefile.am
index e65c9ec..36518c7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,9 +24,7 @@ EXTRA_DIST = \
        gwin32.c                \
        config.h.win32          \
        build-dll               \
-       glib.rc                 \
-       gmodule.rc              \
-       gthread.rc
+       glib.rc
 
 lib_LTLIBRARIES = libglib.la
 
@@ -109,12 +107,6 @@ makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.in
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule.rc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread.rc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 .PHONY: files release sanity snapshot
 
 files:

diff --git a/glib/Makefile.am b/glib/Makefile.am
index e65c9ec..36518c7 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -24,9 +24,7 @@ EXTRA_DIST = \
        gwin32.c                \
        config.h.win32          \
        build-dll               \
-       glib.rc                 \
-       gmodule.rc              \
-       gthread.rc
+       glib.rc
 
 lib_LTLIBRARIES = libglib.la
 
@@ -109,12 +107,6 @@ makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.in
 glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule.rc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread.rc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 .PHONY: files release sanity snapshot
 
 files:

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 33e2104..378fc43 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -11,7 +11,8 @@ EXTRA_DIST =  \
                gmodule-os2.c   \
                gmodule-win32.c \
                gmodule-beos.c  \
-               gmoduleconf.h.win32
+               gmoduleconf.h.win32 \
+               gmodule.rc
 
 BUILT_SOURCES = gmoduleconf.h
 gmoduleconf.h: gmoduleconf.h.in
@@ -48,6 +49,9 @@ noinst_PROGRAMS = testgmodule
 testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@
 testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@
 
+gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 .PHONY: files release
 
 files:

diff --git a/gmodule.rc.in b/gmodule/gmodule.rc.in
similarity index 85%
rename from gmodule.rc.in
rename to gmodule/gmodule.rc.in
index d1b8019..3bbcade 100644 (file)
--- a/gmodule.rc.in
+++ b/gmodule/gmodule.rc.in
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
        VALUE "FileDescription", "GLib"
        VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
        VALUE "InternalName", "gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@"
-       VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000."
+       VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik. Modified by the GLib Team and others 1998-2000."
        VALUE "OriginalFilename", "gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.dll"
        VALUE "ProductName", "GLib"
        VALUE "ProductVersion", "@GLIB_VERSION@"

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index 91cdc02..e46de02 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -7,7 +7,8 @@ EXTRA_DIST =                            \
                gthread-posix.c         \
                gthread-solaris.c       \
                gthread-none.c          \
-               gthread.def
+               gthread.def             \
+               gthread.rc
 
 libglib = $(top_builddir)/libglib.la # -lglib
 
@@ -22,3 +23,7 @@ libgthread_la_LDFLAGS = \
        -export-dynamic
 
 libgthread_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@
+
+gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+

diff --git a/gthread.rc.in b/gthread/gthread.rc.in
similarity index 88%
rename from gthread.rc.in
rename to gthread/gthread.rc.in
index 8198f47..eb6807a 100644 (file)
--- a/gthread.rc.in
+++ b/gthread/gthread.rc.in
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
        VALUE "FileDescription", "GLib"
        VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
        VALUE "InternalName", "gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@"
-       VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000."
+       VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright © 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2000."
        VALUE "OriginalFilename", "gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.dll"
        VALUE "ProductName", "GLib"
        VALUE "ProductVersion", "@GLIB_VERSION@"

diff --git a/makefile.cygwin.in b/makefile.cygwin.in
index d136839..b445286 100644 (file)
--- a/makefile.cygwin.in
+++ b/makefile.cygwin.in
@@ -28,6 +28,9 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 CFLAGS = $(OPTIMIZE) -I. -DHAVE_CONFIG_H
 
+# Kludge to get the path to the win32 headers
+WIN32APIHEADERS = $(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's!/winver.h!!')
+
 all : \
        config.h        \
        glibconfig.h    \
@@ -76,11 +79,13 @@ glib_OBJECTS = \
        gwin32.o        \
        glib-win32res.o
 
-glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
-       ./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) -luser32 -lwsock32
+glibconfig.h: glibconfig.h.win32
+       cp glibconfig.h.win32 glibconfig.h
 
-# Kludge to get the path to the win32 headers
-WIN32APIHEADERS = $(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's!/winver.h!!')
+config.h: config.h.win32
+       cp config.h.win32 config.h
+
+################ glib
 
 # The *.stamp files aren't distributed. Thus, this takes care of only
 # tml building libraries with nonzero build number.
@@ -96,24 +101,16 @@ glib-build.tmp :
        echo 0 >glib-build.tmp
 endif
 
-%-win32res.o : %.rc %-build.tmp
-       m4 -DBUILDNUMBER=`cat $*-build.tmp` <$*.rc >$*-win32res.rc
-       windres --include-dir $(WIN32APIHEADERS) $*-win32res.rc $*-win32res.o
-       rm $*-build.tmp $*-win32res.rc
+glib-win32res.o : glib.rc glib-build.tmp
+       m4 -DBUILDNUMBER=`cat glib-build.tmp` <glib.rc >glib-win32res.rc
+       windres --include-dir $(WIN32APIHEADERS) glib-win32res.rc glib-win32res.o
+       rm glib-build.tmp glib-win32res.rc
 
-glibconfig.h: glibconfig.h.win32
-       cp glibconfig.h.win32 glibconfig.h
+glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
+       ./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) -luser32 -lwsock32
 
-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
 
 gmodule_OBJECTS = \
        gmodule.o       \
@@ -130,6 +127,12 @@ gmodule-build.tmp :
        echo 0 >gmodule-build.tmp
 endif
 
+gmodule-win32res.o : gmodule/gmodule.rc gmodule-build.tmp
+       m4 -DBUILDNUMBER=`cat gmodule-build.tmp` <gmodule/gmodule.rc >gmodule-win32res.rc
+       windres --include-dir $(WIN32APIHEADERS) gmodule-win32res.rc gmodule-win32res.o
+       rm gmodule-build.tmp gmodule-win32res.rc
+
+
 gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule/gmodule.def
        ./build-dll gmodule $(GLIB_VER) gmodule/gmodule.def $(gmodule_OBJECTS) -L. -lglib-$(GLIB_VER) -lwsock32
 
@@ -139,6 +142,8 @@ gmodule.o : gmodule/gmodule.c gmodule/gmodule-win32.c
 gmodule/gmoduleconf.h: gmodule/gmoduleconf.h.win32
        cp gmodule/gmoduleconf.h.win32 gmodule/gmoduleconf.h
 
+################ gthread
+
 gthread_OBJECTS = \
        gthread-impl.o  \
        gthread-win32res.o
@@ -153,12 +158,20 @@ gthread-build.tmp :
        echo 0 >gthread-build.tmp
 endif
 
+gthread-win32res.o : gthread/gthread.rc gthread-build.tmp
+       m4 -DBUILDNUMBER=`cat gthread-build.tmp` <gthread/gthread.rc >gthread-win32res.rc
+       windres --include-dir $(WIN32APIHEADERS) gthread-win32res.rc gthread-win32res.o
+       rm gthread-build.tmp gthread-win32res.rc
+
+
 gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) glib-$(GLIB_VER).dll gthread/gthread.def
        ./build-dll gthread $(GLIB_VER) gthread/gthread.def $(gthread_OBJECTS)  -L. -lglib-$(GLIB_VER) $(PTHREAD_LIB)
 
 gthread-impl.o : gthread/gthread-impl.c gthread/gthread-posix.c
        $(CC) $(CFLAGS) $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread/gthread-impl.c
 
+################ test progs
+
 testglib.exe : glib-$(GLIB_VER).dll testglib.o
        $(CC) $(CFLAGS) -o testglib testglib.o -L. -lglib-$(GLIB_VER) $(LDFLAGS)
 
@@ -202,6 +215,17 @@ libgplugin_b.dll : libgplugin_b.o
 libgplugin_b.o : gmodule/libgplugin_b.c
        $(CC) $(CFLAGS) -Igmodule -c gmodule/libgplugin_b.c
 
+################ other stuff
+
 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 $< >$@
+