From 25d457b86445bc7f088da5dd9b2c06fb78eb9761 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 18 Feb 1999 18:16:40 +0000 Subject: Yet another part of automake VI from Ralf Corsepius : > 4) rtems-rc-19990202-0.diff /reorg-score-cpu.sh > > reorg-score-cpu.sh reorganizes the cpu//* subdirectories in a > similar manner than previous reorg scripts did. rtems-rc-19990202-0.diff > contains the diffs after reorg-score-cpu.sh has been run on a > rtems-19981215 snapshot + my patches up to rtems-rc-19990131-2.diff. > > This patch is rather nasty and may break something. However, I've tested > it for about 10 different target/bsp pairs and believe to have shaken > out most bugs. I wonder about the following .h files that were not moved: a29k/asm.h a29k/cpu_asm.h i386/asm.h i960/asm.h m68k/asm.h m68k/m68302.h m68k/m68360.h m68k/qsm.h m68k/sim.h mips64orion/asm.h mips64orion/cpu_asm.h mips64orion/mips64orion.h no_cpu/asm.h no_cpu/cpu_asm.h powerpc/asm.h powerpc/mpc860.h sh/asm.h sparc/asm.h sparc/erc32.h --- c/src/exec/score/tools/hppa1.1/Makefile.in | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'c/src/exec/score/tools/hppa1.1') diff --git a/c/src/exec/score/tools/hppa1.1/Makefile.in b/c/src/exec/score/tools/hppa1.1/Makefile.in index 0ef6de8843..6d3038f1d6 100644 --- a/c/src/exec/score/tools/hppa1.1/Makefile.in +++ b/c/src/exec/score/tools/hppa1.1/Makefile.in @@ -35,7 +35,7 @@ CPU_DIR=../../cpu/$(RTEMS_CPU) DEFINES += CPPFLAGS += -I$(PROJECT_INCLUDE) \ - -I$(CPU_DIR) + -I$(CPU_DIR) -I$(srcdir)/$(CPU_DIR) CFLAGS += LD_PATHS += @@ -51,14 +51,8 @@ CLOBBER_ADDITIONS += all: ${ARCH} $(SRCS) preinstall $(PGMS) -# Hack -# we are #including files that haven't been installed yet. -# Make sure they are available. -preinstall: ${ARCH} headers $(SRCS) $(PGMS) +preinstall: ${ARCH} $(SRCS) $(PGMS) $(INSTALL) $(INSTBINFLAGS) ${PGMS} ${PROJECT_RELEASE}/bin -headers: FORCE - cd $(CPU_DIR); $(MAKE) install-headers - # Install the program(s), appending _g or _p as appropriate. # for include files, just use $(INSTALL) -- cgit v1.2.3