diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-12 14:20:20 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-12 14:20:20 +0000 |
commit | 3390ba8832c24cd63ce5b029f9677f7399334e39 (patch) | |
tree | eb3e25ec57a56086fe616bc29dfb5f24e2a7fff7 | |
parent | 2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-3390ba8832c24cd63ce5b029f9677f7399334e39.tar.bz2 |
2009-08-12 Joel Sherrill <joel.sherrill@OARcorp.com>
* libcsupport/Makefile.am, libcsupport/preinstall.am,
posix/Makefile.am, posix/preinstall.am, rtems/Makefile.am,
rtems/preinstall.am, score/Makefile.am, score/preinstall.am: Revert
modifications accidentally committed.
Diffstat (limited to '')
-rw-r--r-- | cpukit/ChangeLog | 7 | ||||
-rw-r--r-- | cpukit/libcsupport/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/libcsupport/preinstall.am | 16 | ||||
-rw-r--r-- | cpukit/posix/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/posix/preinstall.am | 16 | ||||
-rw-r--r-- | cpukit/rtems/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/rtems/preinstall.am | 16 | ||||
-rw-r--r-- | cpukit/score/Makefile.am | 1 | ||||
-rw-r--r-- | cpukit/score/preinstall.am | 16 |
9 files changed, 11 insertions, 64 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 7c8179546f..afe751337a 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2009-08-12 Joel Sherrill <joel.sherrill@OARcorp.com> + + * libcsupport/Makefile.am, libcsupport/preinstall.am, + posix/Makefile.am, posix/preinstall.am, rtems/Makefile.am, + rtems/preinstall.am, score/Makefile.am, score/preinstall.am: Revert + modifications accidentally committed. + 2009-08-11 Joel Sherrill <joel.sherrill@OARcorp.com> * score/include/rtems/debug.h: Fix typo. diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index ad50d80723..a3c36f14f3 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -5,7 +5,6 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am -project_lib_LIBRARIES = libcsupport.a noinst_LIBRARIES = libcsupport.a libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am index 4b40b68727..88bfc98bd7 100644 --- a/cpukit/libcsupport/preinstall.am +++ b/cpukit/libcsupport/preinstall.am @@ -8,24 +8,10 @@ endif PREINSTALL_DIRS = DISTCLEANFILES = $(PREINSTALL_DIRS) -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES = $(TMPINSTALL_FILES) - all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) - -$(PROJECT_LIB)/libcsupport.a: libcsupport.a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/libcsupport.a -TMPINSTALL_FILES += $(PROJECT_LIB)/libcsupport.a +CLEANFILES = $(PREINSTALL_FILES) $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 270a6e0b71..a229e1b69c 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -11,7 +11,6 @@ if LIBPOSIX AM_CPPFLAGS += -D__RTEMS_INSIDE__ -project_lib_LIBRARIES = libposix.a noinst_LIBRARIES = libposix.a libposix_a_CPPFLAGS = $(AM_CPPFLAGS) libposix_a_SOURCES = diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am index 1c484fbf8b..eae3fa7ab7 100644 --- a/cpukit/posix/preinstall.am +++ b/cpukit/posix/preinstall.am @@ -8,20 +8,10 @@ endif PREINSTALL_DIRS = DISTCLEANFILES = $(PREINSTALL_DIRS) -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES = $(TMPINSTALL_FILES) - all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +CLEANFILES = $(PREINSTALL_FILES) $(PROJECT_INCLUDE)/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE) @@ -29,10 +19,6 @@ $(PROJECT_INCLUDE)/$(dirstamp): PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) if LIBPOSIX -$(PROJECT_LIB)/libposix.a: libposix.a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/libposix.a -TMPINSTALL_FILES += $(PROJECT_LIB)/libposix.a - if HAS_PTHREADS $(PROJECT_INCLUDE)/sched.h: include/sched.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sched.h diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 863652e8f9..400fc40ad7 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -7,7 +7,6 @@ include $(top_srcdir)/automake/compile.am AM_CPPFLAGS += -D__RTEMS_INSIDE__ -project_lib_LIBRARIES = librtems.a noinst_LIBRARIES = librtems.a librtems_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/cpukit/rtems/preinstall.am b/cpukit/rtems/preinstall.am index 7e5b5692fa..0d87743601 100644 --- a/cpukit/rtems/preinstall.am +++ b/cpukit/rtems/preinstall.am @@ -8,30 +8,16 @@ endif PREINSTALL_DIRS = DISTCLEANFILES = $(PREINSTALL_DIRS) -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES = $(TMPINSTALL_FILES) - all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +CLEANFILES = $(PREINSTALL_FILES) $(PROJECT_INCLUDE)/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE) @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) -$(PROJECT_LIB)/librtems.a: librtems.a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/librtems.a -TMPINSTALL_FILES += $(PROJECT_LIB)/librtems.a - $(PROJECT_INCLUDE)/rtems.h: include/rtems.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems.h diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 12a4be81f7..de06241bd0 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -73,7 +73,6 @@ endif AM_CPPFLAGS += -D__RTEMS_INSIDE__ -project_lib_LIBRARIES = libscore.a noinst_LIBRARIES = libscore.a libscore_a_SOURCES = libscore_a_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/cpukit/score/preinstall.am b/cpukit/score/preinstall.am index 932e176f05..da6f308f63 100644 --- a/cpukit/score/preinstall.am +++ b/cpukit/score/preinstall.am @@ -8,20 +8,10 @@ endif PREINSTALL_DIRS = DISTCLEANFILES += $(PREINSTALL_DIRS) -all-local: $(TMPINSTALL_FILES) - -TMPINSTALL_FILES = -CLEANFILES = $(TMPINSTALL_FILES) - all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = -CLEANFILES += $(PREINSTALL_FILES) - -$(PROJECT_LIB)/$(dirstamp): - @$(MKDIR_P) $(PROJECT_LIB) - @: > $(PROJECT_LIB)/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_LIB)/$(dirstamp) +CLEANFILES = $(PREINSTALL_FILES) $(PROJECT_INCLUDE)/rtems/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems @@ -297,7 +287,3 @@ $(PROJECT_INCLUDE)/rtems/score/threadmp.inl: inline/rtems/score/threadmp.inl $(P $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/threadmp.inl PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.inl endif -$(PROJECT_LIB)/libscore.a: libscore.a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/libscore.a -TMPINSTALL_FILES += $(PROJECT_LIB)/libscore.a - |