summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/libcsupport/preinstall.am16
-rw-r--r--cpukit/posix/preinstall.am16
-rw-r--r--cpukit/rtems/Makefile.am1
-rw-r--r--cpukit/rtems/preinstall.am16
-rw-r--r--cpukit/sapi/Makefile.am1
-rw-r--r--cpukit/sapi/preinstall.am16
-rw-r--r--cpukit/score/Makefile.am1
-rw-r--r--cpukit/score/preinstall.am16
9 files changed, 11 insertions, 78 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 5770c0db00..928e87483f 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,11 @@
2007-12-13 Joel Sherrill <joel.sherrill@OARcorp.com>
+ * libcsupport/preinstall.am, posix/preinstall.am, rtems/Makefile.am,
+ rtems/preinstall.am, sapi/Makefile.am, sapi/preinstall.am,
+ score/Makefile.am, score/preinstall.am: Revert testing patch.
+
+2007-12-13 Joel Sherrill <joel.sherrill@OARcorp.com>
+
* posix/src/sched_rr_get_interval.c: Fix warning.
2007-12-13 Joel Sherrill <joel.sherrill@OARcorp.com>
diff --git a/cpukit/libcsupport/preinstall.am b/cpukit/libcsupport/preinstall.am
index 36011e9725..520d071de9 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/preinstall.am b/cpukit/posix/preinstall.am
index aeaf59f589..5531e7c852 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 2040578047..2d4895fe8b 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 2d793d70c6..8d00fe9ad3 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/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 1b0a06a7af..ad4b3fa864 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -19,7 +19,6 @@ include_rtems_HEADERS += inline/rtems/extension.inl
## src
AM_CPPFLAGS += -D__RTEMS_INSIDE__
-project_lib_LIBRARIES = libsapi.a
noinst_LIBRARIES = libsapi.a
libsapi_a_SOURCES = src/debug.c src/extension.c src/extensioncreate.c \
src/extensiondelete.c src/extensionident.c src/fatal.c src/exinit.c \
diff --git a/cpukit/sapi/preinstall.am b/cpukit/sapi/preinstall.am
index 9718e904db..e3f34d07ba 100644
--- a/cpukit/sapi/preinstall.am
+++ b/cpukit/sapi/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
@@ -64,7 +54,3 @@ $(PROJECT_INCLUDE)/rtems/extension.inl: inline/rtems/extension.inl $(PROJECT_INC
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/extension.inl
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl
-$(PROJECT_LIB)/libsapi.a: libsapi.a $(PROJECT_LIB)/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_LIB)/libsapi.a
-TMPINSTALL_FILES += $(PROJECT_LIB)/libsapi.a
-
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index 68495af394..c5163e1817 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -64,7 +64,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 984dd9a99f..040616aa6a 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
@@ -283,7 +273,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
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 21:33:13 +0000