From f724a870c6722fd4664857d471b538646819e47e Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 30 Aug 1999 16:25:54 +0000 Subject: Patch from Ralf Corsepius : This patch addresses a few configuration issues and removes some duplicate configuration files. Background: * some files used in AC_INIT were not unique enough and can lead to problems if a user plays with configure scripts. * the Makefile templates are independent of the target/cpu and bsp, so the bsp dependent versions (c/src/make/Templates) are removed. To apply: patch -p1 < rtems-rc-19990820-3.diff rm -f c/src/make/Templates ./autogen ATTENTION: This patch removes several files and one directory :) --- make/Templates/Makefile.in | 46 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 10 deletions(-) (limited to 'make/Templates/Makefile.in') diff --git a/make/Templates/Makefile.in b/make/Templates/Makefile.in index b179f335f8..86cb388fed 100644 --- a/make/Templates/Makefile.in +++ b/make/Templates/Makefile.in @@ -87,10 +87,15 @@ target_subdirs = @target_subdirs@ AUTOMAKE_OPTIONS = foreign 1.4 -EXTRA_DIST = Makefile.dir Makefile.leaf Makefile.lib +rtems_makedir = $(prefix)/make +rtems_make_Templatesdir = $(rtems_makedir)/Templates + +rtems_make_Templates_DATA = Makefile.dir Makefile.leaf Makefile.lib mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = +DATA = $(rtems_make_Templates_DATA) + DIST_COMMON = Makefile.am Makefile.in @@ -107,6 +112,25 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + +install-rtems_make_TemplatesDATA: $(rtems_make_Templates_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir) + @list='$(rtems_make_Templates_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \ + else if test -f $$p; then \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \ + fi; fi; \ + done + +uninstall-rtems_make_TemplatesDATA: + @$(NORMAL_UNINSTALL) + list='$(rtems_make_Templates_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \ + done tags: TAGS TAGS: @@ -142,19 +166,20 @@ installcheck: installcheck-am install-exec-am: install-exec: install-exec-am -install-data-am: +install-data-am: install-rtems_make_TemplatesDATA install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +uninstall-am: uninstall-rtems_make_TemplatesDATA uninstall: uninstall-am -all-am: Makefile +all-am: Makefile $(DATA) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: + $(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir) mostlyclean-generic: @@ -184,12 +209,13 @@ maintainer-clean-am: maintainer-clean-generic distclean-am maintainer-clean: maintainer-clean-am -.PHONY: 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 mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +.PHONY: uninstall-rtems_make_TemplatesDATA \ +install-rtems_make_TemplatesDATA 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 \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean debug-am: -- cgit v1.2.3