diff options
-rw-r--r-- | c/src/exec/score/cpu/powerpc/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/exec/score/cpu/powerpc/Makefile.am | 25 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/ChangeLog | 4 | ||||
-rw-r--r-- | cpukit/score/cpu/powerpc/Makefile.am | 25 |
4 files changed, 42 insertions, 16 deletions
diff --git a/c/src/exec/score/cpu/powerpc/ChangeLog b/c/src/exec/score/cpu/powerpc/ChangeLog index e5854db6e9..4918cfdefb 100644 --- a/c/src/exec/score/cpu/powerpc/ChangeLog +++ b/c/src/exec/score/cpu/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2002-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Reflect changes from 2002-01-23. + 2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * rtems/Makefile.am: Removed. diff --git a/c/src/exec/score/cpu/powerpc/Makefile.am b/c/src/exec/score/cpu/powerpc/Makefile.am index 11ca547fc2..d706fc127a 100644 --- a/c/src/exec/score/cpu/powerpc/Makefile.am +++ b/c/src/exec/score/cpu/powerpc/Makefile.am @@ -5,19 +5,30 @@ AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -include_HEADERS = asm.h - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = rtems/score/ppc.h rtems/score/ppctypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) # $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o # $(INSTALL_DATA) $< $@ @@ -25,12 +36,10 @@ $(PROJECT_INCLUDE)/%.h: %.h # $(REL): $(rtems_cpu_rel_OBJECTS) # $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) # TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index e5854db6e9..4918cfdefb 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2002-01-28 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Reflect changes from 2002-01-23. + 2002-01-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * rtems/Makefile.am: Removed. diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am index 11ca547fc2..d706fc127a 100644 --- a/cpukit/score/cpu/powerpc/Makefile.am +++ b/cpukit/score/cpu/powerpc/Makefile.am @@ -5,19 +5,30 @@ AUTOMAKE_OPTIONS = foreign 1.5 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal -SUBDIRS = rtems - -include_HEADERS = asm.h - include $(top_srcdir)/../../../../../../automake/multilib.am include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +$(PROJECT_INCLUDE)/%.h: %.h + $(INSTALL_DATA) $< $@ + $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +include_HEADERS = asm.h +PREINSTALL_FILES = $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) + +include_rtems_scoredir = $(includedir)/rtems/score +include_rtems_score_HEADERS = rtems/score/ppc.h rtems/score/ppctypes.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) # $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o # $(INSTALL_DATA) $< $@ @@ -25,12 +36,10 @@ $(PROJECT_INCLUDE)/%.h: %.h # $(REL): $(rtems_cpu_rel_OBJECTS) # $(make-rel) -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) # TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) -include $(top_srcdir)/../../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../../automake/local.am |