From 923b45c987942ac178263d80faafeab262d6ef9a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 11 Jun 1999 14:21:17 +0000 Subject: Fixed Makefile.in to not attempt to install rtems.o twice from two different directories. --- c/src/exec/score/cpu/a29k/wrap/Makefile.in | 1 - c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in | 1 - c/src/exec/score/cpu/i386/wrap/Makefile.in | 1 - c/src/exec/score/cpu/i960/wrap/Makefile.in | 1 - c/src/exec/score/cpu/m68k/wrap/Makefile.in | 1 - c/src/exec/score/cpu/mips64orion/wrap/Makefile.in | 1 - c/src/exec/score/cpu/no_cpu/wrap/Makefile.in | 1 - c/src/exec/score/cpu/powerpc/wrap/Makefile.in | 1 - c/src/exec/score/cpu/sh/wrap/Makefile.in | 1 - c/src/exec/score/cpu/sparc/wrap/Makefile.in | 1 - 10 files changed, 10 deletions(-) (limited to 'c/src/exec') diff --git a/c/src/exec/score/cpu/a29k/wrap/Makefile.in b/c/src/exec/score/cpu/a29k/wrap/Makefile.in index c77904b640..f06c307655 100644 --- a/c/src/exec/score/cpu/a29k/wrap/Makefile.in +++ b/c/src/exec/score/cpu/a29k/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in index 652204cfa2..c03b653d21 100644 --- a/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in +++ b/c/src/exec/score/cpu/hppa1.1/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/i386/wrap/Makefile.in b/c/src/exec/score/cpu/i386/wrap/Makefile.in index d870efcf8d..5cdc43fbb2 100644 --- a/c/src/exec/score/cpu/i386/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i386/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/i960/wrap/Makefile.in b/c/src/exec/score/cpu/i960/wrap/Makefile.in index f9b43a55b3..e572dbd937 100644 --- a/c/src/exec/score/cpu/i960/wrap/Makefile.in +++ b/c/src/exec/score/cpu/i960/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/m68k/wrap/Makefile.in b/c/src/exec/score/cpu/m68k/wrap/Makefile.in index 1195fc7129..e254525fad 100644 --- a/c/src/exec/score/cpu/m68k/wrap/Makefile.in +++ b/c/src/exec/score/cpu/m68k/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in index 510ba16ad9..cf0af8409b 100644 --- a/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in +++ b/c/src/exec/score/cpu/mips64orion/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in index fd0d7a649c..be33fee786 100644 --- a/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in +++ b/c/src/exec/score/cpu/no_cpu/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in index b0ebd40bc4..d7605800df 100644 --- a/c/src/exec/score/cpu/powerpc/wrap/Makefile.in +++ b/c/src/exec/score/cpu/powerpc/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/sh/wrap/Makefile.in b/c/src/exec/score/cpu/sh/wrap/Makefile.in index dba61a0302..9a2bf7dff5 100644 --- a/c/src/exec/score/cpu/sh/wrap/Makefile.in +++ b/c/src/exec/score/cpu/sh/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) diff --git a/c/src/exec/score/cpu/sparc/wrap/Makefile.in b/c/src/exec/score/cpu/sparc/wrap/Makefile.in index cad79b3d9d..143457b27d 100644 --- a/c/src/exec/score/cpu/sparc/wrap/Makefile.in +++ b/c/src/exec/score/cpu/sparc/wrap/Makefile.in @@ -75,7 +75,6 @@ all: ${ARCH} $(SRCS) preinstall $(OBJS) $(ARCH)/rtems.o $(RELS) # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL_CHANGE) install: all - $(INSTALL_VARIANT) -m 644 ../$(ARCH)/rtems.o ${PROJECT_RELEASE}/lib preinstall: ${ARCH} $(INSTALL_CHANGE) -m 444 ${H_FILES} $(PROJECT_INCLUDE) -- cgit v1.2.3