# HG changeset patch # User John W. Eaton # Date 1334157690 14400 # Node ID 1bf39e944e431c638a8b17c450665669ed3f4ae7 # Parent b8edefd8c111ecd6d29a6ae8808c5f60a0624d0b rename .in.h and .in.cc files to .h.in and .cc.in * defaults.in.h: Rename from defaults.h.in. * graphics.in.h: Rename from graphics.h.in. * mkoctfile.in.cc: Rename from mkoctfile.cc.in. * mxarray.in.h: Rename from mxarray.h.in. * oct-conf.in.h: Rename from oct-conf.h.in. * oct-errno.in.cc: Rename from oct-errno.cc.in. * octave-config.in.cc: Rename from octave-config.cc.in. * version.in.h: Rename from version.h.in. * mkoctfile.in.sh: Rename from mkoctfile.in. * octave-config.in.sh: Rename from octave-config.in. * src/Makefile.am (EXTRA_DIST): Update list. Update rules to use new names. diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -97,27 +97,27 @@ EXTRA_DIST = \ Makefile.in \ - defaults.h.in \ + defaults.in.h \ DOCSTRINGS \ find-defun-files.sh \ genprops.awk \ gl2ps.c \ - graphics.h.in \ + graphics.in.h \ mk-errno-list \ mk-pkg-add \ mkbuiltins \ mkdefs \ mkgendoc \ - mkoctfile.cc.in \ - mkoctfile.in \ + mkoctfile.in.cc \ + mkoctfile.in.sh \ mkops \ - mxarray.h.in \ - oct-conf.h.in \ - oct-errno.cc.in \ - octave-config.cc.in \ - octave-config.in \ + mxarray.in.h \ + oct-conf.in.h \ + oct-errno.in.cc \ + octave-config.in.cc \ + octave-config.in.sh \ octave.gperf \ - version.h.in \ + version.in.h \ $(BUILT_DISTFILES) OPT_HANDLERS = \ @@ -581,14 +581,14 @@ ## defaults.h and oct-conf.h must depend on Makefile. Calling configure ## may change default/config values. However, calling configure will also ## regenerate the Makefiles from Makefile.am and trigger the rules below. -defaults.h: defaults.h.in Makefile +defaults.h: defaults.in.h Makefile @$(do_subst_default_vals) -graphics.h: graphics.h.in genprops.awk Makefile +graphics.h: graphics.in.h genprops.awk Makefile $(AWK) -f $(srcdir)/genprops.awk $< > $@-t mv $@-t $@ -oct-conf.h: oct-conf.h.in Makefile +oct-conf.h: oct-conf.in.h Makefile @$(do_subst_config_vals) ## Don't use a pipeline to process gperf output since if gperf @@ -601,12 +601,12 @@ mv $@-t $@ rm -f $@-t1 -mxarray.h: mxarray.h.in Makefile +mxarray.h: mxarray.in.h Makefile $(SED) < $< \ -e "s|%OCTAVE_IDX_TYPE%|${OCTAVE_IDX_TYPE}|" > $@-t mv $@-t $@ -version.h: version.h.in Makefile +version.h: version.in.h Makefile $(SED) < $< \ -e "s|%OCTAVE_API_VERSION_NUMBER%|${OCTAVE_API_VERSION_NUMBER}|" \ -e "s|%OCTAVE_API_VERSION%|\"${OCTAVE_API_VERSION}\"|" \ @@ -619,7 +619,7 @@ $(srcdir)/mkbuiltins $(DEF_FILES) > $@-t mv $@-t $@ -graphics-props.cc: graphics.h.in genprops.awk Makefile +graphics-props.cc: graphics.in.h genprops.awk Makefile $(AWK) -v emit_graphics_props=1 -f $(srcdir)/genprops.awk $< > $@-t mv $@-t $@ @@ -627,7 +627,7 @@ $(srcdir)/mkops $(OPERATORS_SRC) > $@-t mv $@-t $@ -oct-errno.cc: oct-errno.cc.in Makefile +oct-errno.cc: oct-errno.in.cc Makefile if test -n "$(PERL)"; then \ $(srcdir)/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ elif test -n "$(PYTHON)"; then \ @@ -689,17 +689,17 @@ endif if AMCOND_BUILD_COMPILED_AUX_PROGRAMS -octave-config.cc: octave-config.cc.in Makefile +octave-config.cc: octave-config.in.cc Makefile @$(do_subst_default_vals) -mkoctfile.cc: mkoctfile.cc.in Makefile +mkoctfile.cc: mkoctfile.in.cc Makefile @$(do_subst_config_vals) else -octave-config: octave-config.in Makefile +octave-config: octave-config.in.sh Makefile @$(do_subst_default_vals) chmod a+rx $@ -mkoctfile: mkoctfile.in Makefile +mkoctfile: mkoctfile.in.sh Makefile @$(do_subst_config_vals) chmod a+rx $@ endif diff --git a/src/defaults.h.in b/src/defaults.in.h rename from src/defaults.h.in rename to src/defaults.in.h diff --git a/src/graphics.h.in b/src/graphics.in.h rename from src/graphics.h.in rename to src/graphics.in.h diff --git a/src/mkoctfile.cc.in b/src/mkoctfile.in.cc rename from src/mkoctfile.cc.in rename to src/mkoctfile.in.cc diff --git a/src/mkoctfile.in b/src/mkoctfile.in.sh rename from src/mkoctfile.in rename to src/mkoctfile.in.sh diff --git a/src/mxarray.h.in b/src/mxarray.in.h rename from src/mxarray.h.in rename to src/mxarray.in.h diff --git a/src/oct-conf.h.in b/src/oct-conf.in.h rename from src/oct-conf.h.in rename to src/oct-conf.in.h diff --git a/src/oct-errno.cc.in b/src/oct-errno.in.cc rename from src/oct-errno.cc.in rename to src/oct-errno.in.cc diff --git a/src/octave-config.cc.in b/src/octave-config.in.cc rename from src/octave-config.cc.in rename to src/octave-config.in.cc diff --git a/src/octave-config.in b/src/octave-config.in.sh rename from src/octave-config.in rename to src/octave-config.in.sh diff --git a/src/version.h.in b/src/version.in.h rename from src/version.h.in rename to src/version.in.h