Changeset f724a870 in rtems


Ignore:
Timestamp:
08/30/99 16:25:54 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
260b0c2
Parents:
473741b
Message:

Patch from Ralf Corsepius <corsepiu@…>:

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 :)

Files:
5 deleted
14 edited

Legend:

Unmodified
Added
Removed

  • c/configure

    r473741b rf724a870  
    465465# A filename unique to this package, relative to the directory that
    466466# configure is in, which we can look for to find out if srcdir is correct.
    467 ac_unique_file=README
     467ac_unique_file=src
    468468
    469469# Find the source files, if location was not specified.

  • c/configure.in

    r473741b rf724a870  
    44
    55AC_PREREQ(2.13)
    6 AC_INIT(README)
     6AC_INIT(src)
    77RTEMS_TOP(..)
    88AC_CONFIG_AUX_DIR(..)

  • c/src/configure

    r473741b rf724a870  
    457457# A filename unique to this package, relative to the directory that
    458458# configure is in, which we can look for to find out if srcdir is correct.
    459 ac_unique_file=README
     459ac_unique_file=exec
    460460
    461461# Find the source files, if location was not specified.

  • c/src/configure.in

    r473741b rf724a870  
    44
    55AC_PREREQ(2.13)
    6 AC_INIT(README)
     6AC_INIT(exec)
    77RTEMS_TOP(../..)
    88AC_CONFIG_AUX_DIR(../..)

  • c/src/make/Makefile.am

    r473741b rf724a870  
    4242endif
    4343
    44 SUBDIRS = compilers custom Templates
     44SUBDIRS = compilers custom
    4545
    4646include $(top_srcdir)/../../../automake/subdirs.am

  • c/src/make/Makefile.in

    r473741b rf724a870  
    153153
    154154
    155 SUBDIRS = compilers custom Templates
     155SUBDIRS = compilers custom
    156156ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    157157mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs

  • c/src/make/configure

    r473741b rf724a870  
    31423142target.cfg
    31433143bsp.cfg
    3144 Templates/Makefile
    31453144custom/Makefile
    31463145custom/default.cfg
    … …  
    33113310target.cfg
    33123311bsp.cfg
    3313 Templates/Makefile
    33143312custom/Makefile
    33153313custom/default.cfg

  • c/src/make/configure.in

    r473741b rf724a870  
    126126target.cfg
    127127bsp.cfg
    128 Templates/Makefile
    129128custom/Makefile
    130129custom/default.cfg

  • configure

    r473741b rf724a870  
    480480# A filename unique to this package, relative to the directory that
    481481# configure is in, which we can look for to find out if srcdir is correct.
    482 ac_unique_file=README
     482ac_unique_file=c
    483483
    484484# Find the source files, if location was not specified.

  • configure.in

    r473741b rf724a870  
    55
    66AC_PREREQ(2.13)
    7 AC_INIT(README)
     7AC_INIT(c)
    88RTEMS_TOP(.)
    99

  • make/Templates/Makefile.am

    r473741b rf724a870  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 EXTRA_DIST = \
     7rtems_makedir=$(prefix)/make
     8rtems_make_Templatesdir=$(rtems_makedir)/Templates
     9
     10rtems_make_Templates_DATA = \
    811Makefile.dir \
    912Makefile.leaf \

  • make/Templates/Makefile.in

    r473741b rf724a870  
    8888AUTOMAKE_OPTIONS = foreign 1.4
    8989
    90 EXTRA_DIST =  Makefile.dir Makefile.leaf Makefile.lib
     90rtems_makedir = $(prefix)/make
     91rtems_make_Templatesdir = $(rtems_makedir)/Templates
     92
     93rtems_make_Templates_DATA =  Makefile.dir Makefile.leaf Makefile.lib
    9194
    9295mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
    9396CONFIG_CLEAN_FILES =
     97DATA =  $(rtems_make_Templates_DATA)
     98
    9499DIST_COMMON =  Makefile.am Makefile.in
    95100
    … …  
    108113          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
    109114
     115
     116install-rtems_make_TemplatesDATA: $(rtems_make_Templates_DATA)
     117        @$(NORMAL_INSTALL)
     118        $(mkinstalldirs) $(DESTDIR)$(rtems_make_Templatesdir)
     119        @list='$(rtems_make_Templates_DATA)'; for p in $$list; do \
     120          if test -f $(srcdir)/$$p; then \
     121            echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \
     122            $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
     123          else if test -f $$p; then \
     124            echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p"; \
     125            $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
     126          fi; fi; \
     127        done
     128
     129uninstall-rtems_make_TemplatesDATA:
     130        @$(NORMAL_UNINSTALL)
     131        list='$(rtems_make_Templates_DATA)'; for p in $$list; do \
     132          rm -f $(DESTDIR)$(rtems_make_Templatesdir)/$$p; \
     133        done
    110134tags: TAGS
    111135TAGS:
    … …  
    143167install-exec: install-exec-am
    144168
    145 install-data-am:
     169install-data-am: install-rtems_make_TemplatesDATA
    146170install-data: install-data-am
    147171
    … …  
    149173        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
    150174install: install-am
    151 uninstall-am:
     175uninstall-am: uninstall-rtems_make_TemplatesDATA
    152176uninstall: uninstall-am
    153 all-am: Makefile
     177all-am: Makefile $(DATA)
    154178all-redirect: all-am
    155179install-strip:
    156180        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    157181installdirs:
     182        $(mkinstalldirs)  $(DESTDIR)$(rtems_make_Templatesdir)
    158183
    159184
    … …  
    185210maintainer-clean: maintainer-clean-am
    186211
    187 .PHONY: tags distdir info-am info dvi-am dvi check check-am \
    188 installcheck-am installcheck install-exec-am install-exec \
    189 install-data-am install-data install-am install uninstall-am uninstall \
    190 all-redirect all-am all installdirs mostlyclean-generic \
    191 distclean-generic clean-generic maintainer-clean-generic clean \
    192 mostlyclean distclean maintainer-clean
     212.PHONY: uninstall-rtems_make_TemplatesDATA \
     213install-rtems_make_TemplatesDATA tags distdir info-am info dvi-am dvi \
     214check check-am installcheck-am installcheck install-exec-am \
     215install-exec install-data-am install-data install-am install \
     216uninstall-am uninstall all-redirect all-am all installdirs \
     217mostlyclean-generic distclean-generic clean-generic \
     218maintainer-clean-generic clean mostlyclean distclean maintainer-clean
    193219
    194220

  • tools/build/configure

    r473741b rf724a870  
    457457# A filename unique to this package, relative to the directory that
    458458# configure is in, which we can look for to find out if srcdir is correct.
    459 ac_unique_file=README
     459ac_unique_file=install-if-change.in
    460460
    461461# Find the source files, if location was not specified.

  • tools/build/configure.in

    r473741b rf724a870  
    44
    55AC_PREREQ(2.13)
    6 AC_INIT(README)
     6AC_INIT(install-if-change.in)
    77AC_CONFIG_AUX_DIR(../..)
    88RTEMS_TOP(../..)
Note: See TracChangeset for help on using the changeset viewer.