diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-12 15:00:15 +0000 |
commit | df49c60c9671e4a28e636964d744c1f59fb6cb68 (patch) | |
tree | eabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/wrapup | |
parent | Purged as many egcs references as possible. (diff) | |
download | rtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2 |
Merged from 4.5.0-beta3a
Diffstat (limited to 'c/src/wrapup')
-rw-r--r-- | c/src/wrapup/Makefile.am | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 7e4282dee4..4c6d14a014 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -9,13 +9,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../automake/lib.am -LIBNAME = librtemsall -LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a +LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a if HAS_NETWORKING -LIBNETWORKING = \ - $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \ - $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a +LIBNETWORKING = $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \ + $(PROJECT_RELEASE)/lib/librpc$(LIB_VARIANT).a \ + $(PROJECT_RELEASE)/lib/libxdr$(LIB_VARIANT).a endif if HAS_RDBG @@ -26,8 +25,7 @@ SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/librtems$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/libposix$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libitron$(LIB_VARIANT).a) \ - $(LIBNETWORKING) \ - $(LIBRDBG) \ + $(LIBNETWORKING) $(LIBRDBG) \ $(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \ $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \ @@ -36,12 +34,9 @@ SRCS = $(wildcard $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a) \ $(PROJECT_RELEASE)/lib/libmisc$(LIB_VARIANT).a \ $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o) -TMPINSTALL_FILES += \ -$(PROJECT_RELEASE)/lib/$(LIBNAME)${LIB_VARIANT}.a +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a -all: $(ARCH) $(TMPINSTALL_FILES) - -install: all +all-local: $(ARCH) $(TMPINSTALL_FILES) $(LIB): $(SRCS) rm -f $@ |