Added various win32 related *.in files to EXTRA_DIST to let 'make

2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
	tests/Makefile.am: Added various win32 related *.in files to
	EXTRA_DIST to let 'make distcheck' procude all the corresponding
	files, which it silently fails to do currently.

diff --git a/ChangeLog b/ChangeLog
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 01eee2172eca0b6ec70242afe2581d283741dbc4..85c3c7311963c098ae7bc5ed94599d2074a5f1b7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2000-03-24  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, gthread/Makefile.am, gmodule/Makefile.am,
+       tests/Makefile.am: Added various win32 related *.in files to
+       EXTRA_DIST to let 'make distcheck' procude all the corresponding
+       files, which it silently fails to do currently.
+
 2000-03-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: After finding the right thread library (containing

diff --git a/Makefile.am b/Makefile.am
index 36518c7c4c5c50a63606e5eb2740effbc1abf82a..3f970a3c7d5df623133e85ddfa103e0adecb712e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,13 +18,18 @@ EXTRA_DIST = \
        README.win32            \
        glib.def                \
        makefile.msc            \
+       makefile.msc.in         \
        makefile.cygwin         \
+       makefile.cygwin.in      \
        giowin32.c              \
        glibconfig.h.win32      \
+       glibconfig.h.win32.in   \
        gwin32.c                \
        config.h.win32          \
+       config.h.win32.in       \
        build-dll               \
-       glib.rc
+       glib.rc                 \
+       glib.rc.in
 
 lib_LTLIBRARIES = libglib.la
 

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 36518c7c4c5c50a63606e5eb2740effbc1abf82a..3f970a3c7d5df623133e85ddfa103e0adecb712e 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -18,13 +18,18 @@ EXTRA_DIST = \
        README.win32            \
        glib.def                \
        makefile.msc            \
+       makefile.msc.in         \
        makefile.cygwin         \
+       makefile.cygwin.in      \
        giowin32.c              \
        glibconfig.h.win32      \
+       glibconfig.h.win32.in   \
        gwin32.c                \
        config.h.win32          \
+       config.h.win32.in       \
        build-dll               \
-       glib.rc
+       glib.rc                 \
+       glib.rc.in
 
 lib_LTLIBRARIES = libglib.la
 

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 378fc437589ecf695f4e5259b32a135cb8f3a00e..2aa96aef3675a18714b04f73652bb14c4d5d4183 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -12,7 +12,8 @@ EXTRA_DIST =  \
                gmodule-win32.c \
                gmodule-beos.c  \
                gmoduleconf.h.win32 \
-               gmodule.rc
+               gmodule.rc      \
+               gmodule.rc.in
 
 BUILT_SOURCES = gmoduleconf.h
 gmoduleconf.h: gmoduleconf.h.in
@@ -50,7 +51,7 @@ 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
+       cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 .PHONY: files release
 

diff --git a/gthread/Makefile.am b/gthread/Makefile.am
index e46de02207bfc3ae0d302d2abcf591f565937022..9374543a36c7ebd4a6d9452c995ab7f16f74abff 100644 (file)
--- a/gthread/Makefile.am
+++ b/gthread/Makefile.am
@@ -8,7 +8,8 @@ EXTRA_DIST =                            \
                gthread-solaris.c       \
                gthread-none.c          \
                gthread.def             \
-               gthread.rc
+               gthread.rc              \
+               gthread.rc.in
 
 libglib = $(top_builddir)/libglib.la # -lglib
 
@@ -25,5 +26,5 @@ libgthread_la_LDFLAGS = \
 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
+       cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1398ede0119325967640a7844e466cb22ccf331e..c1e68cadbab329732b3368816f17496c64b6e134 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,10 +3,9 @@ INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST = \
        makefile.msc    \
-       makefile.cygwin
-
-EXTRA_DIST = \
-       makefile.msc
+       makefile.msc.in \
+       makefile.cygwin \
+       makefile.cygwin.in
 
 TESTS = \
        array-test      \