summaryrefslogtreecommitdiffstats
path: root/cpukit/rtems
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-08-12 14:20:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-08-12 14:20:20 +0000
commit3390ba8832c24cd63ce5b029f9677f7399334e39 (patch)
treeeb3e25ec57a56086fe616bc29dfb5f24e2a7fff7 /cpukit/rtems
parent2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-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 'cpukit/rtems')
-rw-r--r--cpukit/rtems/Makefile.am1
-rw-r--r--cpukit/rtems/preinstall.am16
2 files changed, 1 insertions, 16 deletions
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