diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-02-18 18:36:05 +0000 |
commit | 8548fe0ae29eafea856090e742c1fd205ed4b0fb (patch) | |
tree | b0f3515dadfdea2a2e12a587ea5a2adaab2229db /c/src/lib/libbsp/i386/i386ex | |
parent | Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>: (diff) | |
download | rtems-8548fe0ae29eafea856090e742c1fd205ed4b0fb.tar.bz2 |
Part of the automake VI patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
> 5) rtems-rc-19990202-1.diff/reorg-install.sh
>
> reorg-install.sh fixes a Makefile variable name clash of RTEMS
> configuration files and automake/autoconf standards.
> Until now, RTEMS used $(INSTALL) for install-if-change. Automake and
> autoconf use $(INSTALL) for a bsd-compatible install. As
> install-if-change and bsd-install are not compatible, I renamed all
> references to install-if-changed to $(INSTALL_CHANGED) and used
> $(INSTALL) for bsd-install (==automake/autoconf standard). When
> automake will be introduced install-if-change will probably be replaced
> by $(INSTALL) and therefore will slowly vanish. For the moment, this
> patch fixes a very nasty problem which prevents adding any automake file
> until now (There are still more).
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex')
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/clock/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/console/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/include/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/network/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/start/Makefile.in | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/startup/Makefile.in | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/timer/Makefile.in | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in | 2 |
9 files changed, 23 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.in b/c/src/lib/libbsp/i386/i386ex/Makefile.in index 22f260cb9e..098bad9ce0 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/directory.cfg diff --git a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in index fa1ee1bb31..036e23e333 100644 --- a/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/clock/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/clock.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in index d1514c7109..133a17e5aa 100644 --- a/c/src/lib/libbsp/i386/i386ex/console/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/console/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/console.rel IMPORT_SRC=$(srcdir)/../../shared/io/printk.c diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in b/c/src/lib/libbsp/i386/i386ex/include/Makefile.in index 096f514e64..5b041566e8 100644 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/include/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h # @@ -29,7 +31,7 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += all: $(SRCS) - $(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) - $(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(H_FILES) $(PROJECT_INCLUDE) + $(INSTALL_CHANGE) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE) install: all diff --git a/c/src/lib/libbsp/i386/i386ex/network/Makefile.in b/c/src/lib/libbsp/i386/i386ex/network/Makefile.in index 0e32218ea3..3233205c11 100644 --- a/c/src/lib/libbsp/i386/i386ex/network/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/network/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/network.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/i386/i386ex/start/Makefile.in b/c/src/lib/libbsp/i386/i386ex/start/Makefile.in index 2c6435a980..be36cdc4d5 100644 --- a/c/src/lib/libbsp/i386/i386ex/start/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/start/Makefile.in @@ -7,6 +7,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ + +INSTALL = @INSTALL@ RTEMS_GAS_CODE16 = @RTEMS_GAS_CODE16@ PGMS=${ARCH}/start.o @@ -58,4 +60,4 @@ all: ${ARCH} $(SRCS) $(OBJS) $(PGM) $(INSTALL_VARIANT) -m 555 ${PGMS} ${PROJECT_RELEASE}/lib # Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL) +# for include files, just use $(INSTALL_CHANGE) diff --git a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in index c70ba01bbe..d05231ee77 100644 --- a/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/startup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/.. RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/startup.rel # C source names, if any, go here -- minus the .c @@ -55,14 +57,14 @@ CLEAN_ADDITIONS += CLOBBER_ADDITIONS += preinstall: - $(INSTALL) ${IMPORT_SRC} . + $(INSTALL_CHANGE) ${IMPORT_SRC} . # ${CP} ${IMPORT_SRC} . ${PGM}: ${SRCS} ${OBJS} $(make-rel) all: ${ARCH} preinstall $(SRCS) $(PGM) - $(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib + $(INSTALL_CHANGE) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile install: all diff --git a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in index 939382f56f..eebc425820 100644 --- a/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/timer/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + PGM=${ARCH}/timer.rel # C source names, if any, go here -- minus the .c diff --git a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in index ce00bb7ffb..5aa3d00203 100644 --- a/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in +++ b/c/src/lib/libbsp/i386/i386ex/wrapup/Makefile.in @@ -8,6 +8,8 @@ VPATH = @srcdir@ RTEMS_ROOT = @top_srcdir@ PROJECT_ROOT = @PROJECT_ROOT@ +INSTALL = @INSTALL@ + BSP_PIECES=startup clock console timer $(NETWORK) GENERIC_PIECES= |