* simplify pregenerated config file maintenance

2000-12-21  Frank Ch. Eigler  <fche@redhat.com>

	* Makefile.am: Simplify to install all srcdir *.conf/*.img files.
	* pregen-configs.in: Overwrite srcdir files only if non-comment
	lines are different.
	* Makefile.in: Regenerated.

diff --git a/sid/bsp/pregen/ChangeLog b/sid/bsp/pregen/ChangeLog
index 41a50b2..e1674ee 100644 (file)
--- a/sid/bsp/pregen/ChangeLog
+++ b/sid/bsp/pregen/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-21  Frank Ch. Eigler  <fche@redhat.com>
+
+       * Makefile.am: Simplify to install all srcdir *.conf/*.img files.
+       * pregen-configs.in: Overwrite srcdir files only if non-comment
+       lines are different.
+       * Makefile.in: Regenerated.
+
 2000-11-23  Frank Ch. Eigler  <fche@redhat.com>
 
        * Makefile.am: New file.  Conditionally maintain pregenerated

diff --git a/sid/bsp/pregen/Makefile.am b/sid/bsp/pregen/Makefile.am
index 2dc708f..2bce972 100644 (file)
--- a/sid/bsp/pregen/Makefile.am
+++ b/sid/bsp/pregen/Makefile.am
@@ -3,39 +3,15 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I ../../config
 
-if SIDTARGET_ARM
-FAM0DATA = arm-gloss.conf arm-gloss-tksm.conf arm-glossBE.conf arm-pid.conf arm-pid-tksm.conf arm-pidBE.conf armpid-cygmon.img arm-pid-cygmon-tksm.conf armpid-eCos.img arm-pid-cygmon.conf arm-cma.conf arm-cma-tksm.conf
-else
-FAM0DATA = 
-endif
-
-FAM1DATA =
-
-FAM2DATA = 
-
-FAM3DATA = 
-
-FAM4DATA =
-
-FAM5DATA =
-
-FAM6DATA =
-
-FAM7DATA =
-
-ALLFAMDATA = $(FAM0DATA) $(FAM1DATA) $(FAM2DATA) $(FAM3DATA) $(FAM4DATA) \
-               $(FAM5DATA) $(FAM6DATA) $(FAM7DATA)
-
-# Don't run this makefile in parallel, at least for given targets.
-.NOTPARALLEL: $(ALLFAMDATA)
-
-pkgdata_DATA = $(ALLFAMDATA)
-
-clean-local:
-       rm -f $(ALLFAMDATA)
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+       @for f in `cd $(srcdir); echo *.conf *.img` ; do \
+               echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/$$f"; \
+               $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/$$f; \
+       done
 
 if MAINTAINER_MODE
-$(ALLFAMDATA): stamp-allfamdata
+all-local:     stamp-allfamdata
 
 stamp-allfamdata: ../configrun-sid pregen-configs
        $(SHELL) pregen-configs

diff --git a/sid/bsp/pregen/Makefile.in b/sid/bsp/pregen/Makefile.in
index 877f40c..8097615 100644 (file)
--- a/sid/bsp/pregen/Makefile.in
+++ b/sid/bsp/pregen/Makefile.in
@@ -71,32 +71,8 @@ sidtarget_ppc = @sidtarget_ppc@
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I ../../config
-@SIDTARGET_ARM_TRUE@FAM0DATA = @SIDTARGET_ARM_TRUE@arm-gloss.conf arm-gloss-tksm.conf arm-glossBE.conf arm-pid.conf arm-pid-tksm.conf arm-pidBE.conf armpid-cygmon.img arm-pid-cygmon-tksm.conf armpid-eCos.img arm-pid-cygmon.conf arm-cma.conf arm-cma-tksm.conf
-@SIDTARGET_ARM_FALSE@FAM0DATA = 
-
-FAM1DATA = 
-
-FAM2DATA = 
-
-FAM3DATA = 
-
-FAM4DATA = 
-
-FAM5DATA = 
-
-FAM6DATA = 
-
-FAM7DATA = 
-
-ALLFAMDATA = $(FAM0DATA) $(FAM1DATA) $(FAM2DATA) $(FAM3DATA) $(FAM4DATA) \
-               $(FAM5DATA) $(FAM6DATA) $(FAM7DATA)
-
-
-pkgdata_DATA = $(ALLFAMDATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
 CONFIG_CLEAN_FILES =  pregen-configs
-DATA =  $(pkgdata_DATA)
-
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in pregen-configs.in
 
 
@@ -115,25 +91,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 
 pregen-configs: $(top_builddir)/config.status pregen-configs.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-install-pkgdataDATA: $(pkgdata_DATA)
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-       @list='$(pkgdata_DATA)'; for p in $$list; do \
-         if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$p; \
-         else if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir)/$$p; \
-         fi; fi; \
-       done
-
-uninstall-pkgdataDATA:
-       @$(NORMAL_UNINSTALL)
-       list='$(pkgdata_DATA)'; for p in $$list; do \
-         rm -f $(DESTDIR)$(pkgdatadir)/$$p; \
-       done
 tags: TAGS
 TAGS:
 
@@ -169,20 +126,19 @@ installcheck: installcheck-am
 install-exec-am:
 install-exec: install-exec-am
 
-install-data-am: install-pkgdataDATA
+install-data-am: install-data-local
 install-data: install-data-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-pkgdataDATA
+uninstall-am:
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
+all-am: Makefile all-local
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
-       $(mkinstalldirs)  $(DESTDIR)$(pkgdatadir)
 
 
 mostlyclean-generic:
@@ -198,7 +154,7 @@ mostlyclean-am:  mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am clean-local
+clean-am:  clean-generic mostlyclean-am
 
 clean: clean-am
 
@@ -212,21 +168,22 @@ maintainer-clean-am:  maintainer-clean-generic distclean-am
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: uninstall-pkgdataDATA install-pkgdataDATA tags distdir info-am \
-info dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-local install-data-am install-data install-am install \
+uninstall-am uninstall all-local all-redirect all-am all installdirs \
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
-# Don't run this makefile in parallel, at least for given targets.
-.NOTPARALLEL: $(ALLFAMDATA)
-
-clean-local:
-       rm -f $(ALLFAMDATA)
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+       @for f in `cd $(srcdir); echo *.conf *.img` ; do \
+               echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/$$f"; \
+               $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/$$f; \
+       done
 
-@MAINTAINER_MODE_TRUE@$(ALLFAMDATA):   stamp-allfamdata
+@MAINTAINER_MODE_TRUE@all-local:       stamp-allfamdata
 
 @MAINTAINER_MODE_TRUE@stamp-allfamdata: ../configrun-sid pregen-configs
 @MAINTAINER_MODE_TRUE@ $(SHELL) pregen-configs

diff --git a/sid/bsp/pregen/pregen-configs.in b/sid/bsp/pregen/pregen-configs.in
index 496d9b6..fa67ce2 100755 (executable)
--- a/sid/bsp/pregen/pregen-configs.in
+++ b/sid/bsp/pregen/pregen-configs.in
@@ -15,15 +15,28 @@ fi
 
 
 crs () {
-    ../configrun-sid $@
+    ../configrun-sid $@ >/dev/null
 }
 
 mvic() {
-    mv -f $1 $srcdir/$2
+    if [ ! -f $1 ]; then
+       echo "$1 does not exist!" 1>&2
+       exit 1
+    elif [ ! -f $srcdir/$2 ]; then
+       mv -f $1 $srcdir/$2
+    else
+       sum1=`cat $1 | grep -v "^#" | sum`
+       sum2=`cat $srcdir/$2 | grep -v "^#" | sum`
+       if [ "$sum1" != "$sum2" ]; then
+           mv -f $1 $srcdir/$2
+           echo "$2 updated."
+       else
+           echo "$2 effectively unchanged."
+       fi
+    fi
 }
 
 
-
 crs --cpu=arm --no-run --gdb=5000 -EL
 mvic sid.conf arm-gloss.conf