rename generated fragments to .cci to avoid misunderstandings (was .h). Applies to...

diff --git a/src/Makefile.am b/src/Makefile.am
index 8a861b9a8b21895e57c2c95d6d1d5a21909dec08..af7b0ddbf64937ccd88ce4c323ac605b7b32afe6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -194,15 +194,15 @@ libexec_PROGRAMS = \
        $(UNLINKD)
 
 cf_gen_SOURCES = cf_gen.cc
-nodist_cf_gen_HEADER = cf_gen_defines.h
+nodist_cf_gen_HEADER = cf_gen_defines.cci
 cf_gen_LDADD= \
        $(COMPAT_LIB) \
        $(EPOLL_LIBS) \
        $(MINGW_LIBS) \
        $(XTRA_LIBS)
-cf_gen.$(OBJEXT): cf_gen_defines.h
+cf_gen.$(OBJEXT): cf_gen_defines.cci
 
-## cf_gen.cc needs src/cf_gen_defines.h
+## cf_gen.cc needs src/cf_gen_defines.cci
 INCLUDES += -I$(top_builddir)/src
 
 
@@ -514,8 +514,8 @@ noinst_HEADERS = \
        SquidTime.h
 
 BUILT_SOURCES = \
-       cf_gen_defines.h \
-       cf_parser.h \
+       cf_gen_defines.cci \
+       cf_parser.cci \
        err_type.cc \
        globals.cc \
        hier_code.cc \
@@ -781,16 +781,16 @@ test_cache_digest: test_cache_digest.o CacheDigest.o debug.o globals.o store_key
        $(CC) -o $@ $(LDFLAGS) $@.o CacheDigest.o debug.o globals.o store_key_md5.o $(STD_APP_LIBS)
 
 ## If autodependency works well this is not needed anymore
-cache_cf.o: cf_parser.h
+cache_cf.o: cf_parser.cci
 
-# squid.conf.default is built by cf_gen when making cf_parser.h
-squid.conf.default squid.conf.documented: cf_parser.h
+# squid.conf.default is built by cf_gen when making cf_parser.cci
+squid.conf.default squid.conf.documented: cf_parser.cci
        true
 
-cf_parser.h: cf.data cf_gen$(EXEEXT)
+cf_parser.cci: cf.data cf_gen$(EXEEXT)
        ./cf_gen cf.data $(srcdir)/cf.data.depend
 
-cf_gen_defines.h: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
+cf_gen_defines.cci: $(srcdir)/cf_gen_defines $(srcdir)/cf.data.pre
        $(AWK) -f $(srcdir)/cf_gen_defines <$(srcdir)/cf.data.pre >$@ || ($(RM) -f $@ && exit 1)
 
 

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 7b1ccb920be0fcfddb325f9b3828cc1c2b8ebcd0..bb3f7e48fb9eae978c39c99a5027bb083b9b1d67 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -2848,7 +2848,7 @@ dump_memcachemode(StoreEntry * entry, const char *name, SquidConfig &config)
     storeAppendPrintf(entry, "\n");
 }
 
-#include "cf_parser.h"
+#include "cf_parser.cci"
 
 peer_t
 parseNeighborType(const char *s)

diff --git a/src/cf_gen.cc b/src/cf_gen.cc
index a3282f0ea99df52418f34b47b8576c23cb38f6f6..794f57e93b9c1214c0cfeef40af1fb44b81ea1ea 100644 (file)
--- a/src/cf_gen.cc
+++ b/src/cf_gen.cc
@@ -1,5 +1,5 @@
 /*
- * DEBUG: none          Generate squid.conf.default and cf_parser.h
+ * DEBUG: none          Generate squid.conf.default and cf_parser.cci
  * AUTHOR: Max Okumoto
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -36,7 +36,7 @@
  *             (ie it creates the squid.conf.default file from the cf.data file)
  *
  *             The output files are as follows:
- *             cf_parser.h - this file contains, default_all() which
+ *             cf_parser.cci - this file contains, default_all() which
  *                       initializes variables with the default
  *                       values, parse_line() that parses line from
  *                       squid.conf.default, dump_config that dumps the
@@ -48,7 +48,6 @@
 //#include "squid.h"
 #include "config.h"
 //#include "SquidTime.h"
-#include "cf_gen_defines.h"
 #include "util.h"
 
 #if HAVE_STRING_H
@@ -58,8 +57,10 @@
 #include <ctype.h>
 #endif
 
+#include "cf_gen_defines.cci"
+
 #define MAX_LINE       1024    /* longest configuration line */
-#define _PATH_PARSER           "cf_parser.h"
+#define _PATH_PARSER           "cf_parser.cci"
 #define _PATH_SQUID_CONF       "squid.conf.documented"
 #define _PATH_SQUID_CONF_SHORT "squid.conf.default"
 #define _PATH_CF_DEPEND                "cf.data.depend"