Rename *_.h to *.in.h.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 1c01889df1755641981bc843b75b4bd441f18697..9d8521969bbf6174f2dc59b0922aed7ef4e14ff1 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,5 +1,16 @@
 2007-10-04  Bruno Haible  <bruno@clisp.org>
 
+       * lib/glib/ghash.in.h: Renamed from lib/glib/ghash_.h.
+       * lib/glib/glist.in.h: Renamed from lib/glib/glist_.h.
+       * lib/glib/gprimes.in.h: Renamed from lib/glib/gprimes_.h.
+       * lib/glib/gstrfuncs.in.h: Renamed from lib/glib/gstrfuncs_.h.
+       * lib/glib/gstring.in.h: Renamed from lib/glib/gstring_.h.
+       * lib/glib/gtypes.in.h: Renamed from lib/glib/gtypes_.h.
+       * lib/glib.in.h: Renamed from lib/glib_.h.
+       * lib/glibconfig.in.h: Renamed from lib/glibconfig_.h.
+       * modules/libglib (Files, Makefile.am): Update.
+       * Makefile.am (EXTRA_DIST): Update.
+
        * lib/getopt.in.h.diff: Renamed from lib/getopt_.h.diff.
        * Makefile.am (EXTRA_DIST): Update.
 

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index b215d6c7ba16551369cad7ba288bfdbd5cd0ce46..747b48a733032390ab27b81a171debaa4a6b4b0b 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -48,20 +48,20 @@ lib/fnmatch_loop.c.diff \
 lib/gen-lbrkprop.c \
 lib/getopt.in.h.diff \
 lib/gettext.h \
-lib/glib_.h \
-lib/glibconfig_.h \
+lib/glib.in.h \
+lib/glibconfig.in.h \
 lib/glib/ghash.c \
-lib/glib/ghash_.h \
+lib/glib/ghash.in.h \
 lib/glib/glist.c \
-lib/glib/glist_.h \
+lib/glib/glist.in.h \
 lib/glib/gmessages.c \
 lib/glib/gprimes.c \
-lib/glib/gprimes_.h \
+lib/glib/gprimes.in.h \
 lib/glib/gstrfuncs.c \
-lib/glib/gstrfuncs_.h \
+lib/glib/gstrfuncs.in.h \
 lib/glib/gstring.c \
-lib/glib/gstring_.h \
-lib/glib/gtypes_.h \
+lib/glib/gstring.in.h \
+lib/glib/gtypes.in.h \
 lib/hash.c \
 lib/hash.h \
 lib/html-ostream.oo.c \

diff --git a/gnulib-local/modules/libglib b/gnulib-local/modules/libglib
index f7abe87a5a3f5f809a05e165427535898de8e6a1..cefcf35c63695d3c04bf6d8f1ece128c21678e3a 100644 (file)
--- a/gnulib-local/modules/libglib
+++ b/gnulib-local/modules/libglib
@@ -2,20 +2,20 @@ Description:
 Substitute for a part of glib version 2.12.4.
 
 Files:
-lib/glib_.h
-lib/glibconfig_.h
+lib/glib.in.h
+lib/glibconfig.in.h
 lib/glib/ghash.c
-lib/glib/ghash_.h
+lib/glib/ghash.in.h
 lib/glib/glist.c
-lib/glib/glist_.h
+lib/glib/glist.in.h
 lib/glib/gmessages.c
 lib/glib/gprimes.c
-lib/glib/gprimes_.h
+lib/glib/gprimes.in.h
 lib/glib/gstrfuncs.c
-lib/glib/gstrfuncs_.h
+lib/glib/gstrfuncs.in.h
 lib/glib/gstring.c
-lib/glib/gstring_.h
-lib/glib/gtypes_.h
+lib/glib/gstring.in.h
+lib/glib/gtypes.in.h
 m4/libglib.m4
 
 Depends-on:
@@ -45,57 +45,57 @@ libglib_rpl_la_CPPFLAGS = $(AM_CPPFLAGS) $(NO_CXX)
 
 BUILT_SOURCES += $(LIBGLIB_H)
 
-glib.h: glib_.h
+glib.h: glib.in.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib_.h; \
+         cat $(srcdir)/glib.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glibconfig.h: glibconfig_.h
+glibconfig.h: glibconfig.in.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glibconfig_.h; \
+         cat $(srcdir)/glibconfig.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glib/ghash.h: glib/ghash_.h
+glib/ghash.h: glib/ghash.in.h
        test -d glib || mkdir glib
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib/ghash_.h; \
+         cat $(srcdir)/glib/ghash.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glib/glist.h: glib/glist_.h
+glib/glist.h: glib/glist.in.h
        test -d glib || mkdir glib
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib/glist_.h; \
+         cat $(srcdir)/glib/glist.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glib/gprimes.h: glib/gprimes_.h
+glib/gprimes.h: glib/gprimes.in.h
        test -d glib || mkdir glib
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib/gprimes_.h; \
+         cat $(srcdir)/glib/gprimes.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glib/gstrfuncs.h: glib/gstrfuncs_.h
+glib/gstrfuncs.h: glib/gstrfuncs.in.h
        test -d glib || mkdir glib
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib/gstrfuncs_.h; \
+         cat $(srcdir)/glib/gstrfuncs.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glib/gstring.h: glib/gstring_.h
+glib/gstring.h: glib/gstring.in.h
        test -d glib || mkdir glib
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib/gstring_.h; \
+         cat $(srcdir)/glib/gstring.in.h; \
        } > $@-t
        mv -f $@-t $@
 
-glib/gtypes.h: glib/gtypes_.h
+glib/gtypes.h: glib/gtypes.in.h
        test -d glib || mkdir glib
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-         cat $(srcdir)/glib/gtypes_.h; \
+         cat $(srcdir)/glib/gtypes.in.h; \
        } > $@-t
        mv -f $@-t $@