diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-05-14 22:09:29 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-05-14 22:09:29 +0000 |
| commit | b3afc0f89d1f2664c15f0e7420219d8b01bc4644 (patch) | |
| tree | 563edc0941a50e763ac5893acca2c5a1c01c2b29 /c/src/libmisc | |
| parent | 2002-05-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-b3afc0f89d1f2664c15f0e7420219d8b01bc4644.tar.bz2 | |
2001-05-14 Joel Sherrill <joel@OARcorp.com>
* dummy/Makefile.am, wrapup/Makefile.am: Fixed to generate
a library of the same name.
Diffstat (limited to 'c/src/libmisc')
| -rw-r--r-- | c/src/libmisc/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/libmisc/dummy/Makefile.am | 15 | ||||
| -rw-r--r-- | c/src/libmisc/wrapup/Makefile.am | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/c/src/libmisc/ChangeLog b/c/src/libmisc/ChangeLog index 75fac524c0..334a3edfcc 100644 --- a/c/src/libmisc/ChangeLog +++ b/c/src/libmisc/ChangeLog @@ -1,3 +1,8 @@ +2001-05-14 Joel Sherrill <joel@OARcorp.com> + + * dummy/Makefile.am, wrapup/Makefile.am: Fixed to generate + a library of the same name. + 2002-03-20 Chris Johns <ccj@acm.org> * monitor/mon-command.c: Per PR192 the RTEMS monitor makes everything diff --git a/c/src/libmisc/dummy/Makefile.am b/c/src/libmisc/dummy/Makefile.am index 22fa3c7650..ddabdfbf0d 100644 --- a/c/src/libmisc/dummy/Makefile.am +++ b/c/src/libmisc/dummy/Makefile.am @@ -3,8 +3,8 @@ ## -PGMNAME = dummy -PGM = $(ARCH)/$(PGMNAME).rel +LIBNAME = libdummy-tmp +LIB = $(ARCH)/$(LIBNAME).a C_FILES = dummy.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) @@ -19,17 +19,14 @@ include $(top_srcdir)/../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): $(OBJS) - $(make-rel) - -$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel: $(PGM) - $(INSTALL_DATA) $< $@ +$(LIB): $(OBJS) + $(make-library) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel -all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) -.PRECIOUS: $(PGM) +.PRECIOUS: $(LIB) EXTRA_DIST = README dummy.c diff --git a/c/src/libmisc/wrapup/Makefile.am b/c/src/libmisc/wrapup/Makefile.am index d94952fe80..c0313b140c 100644 --- a/c/src/libmisc/wrapup/Makefile.am +++ b/c/src/libmisc/wrapup/Makefile.am @@ -18,7 +18,7 @@ TMP_LIBS = ../monitor/$(ARCH)/libmonitor-tmp.a \ ../untar/$(ARCH)/libuntar-tmp.a ../stackchk/$(ARCH)/libstackchk-tmp.a \ ../cpuuse/$(ARCH)/libcpuuse-tmp.a ../rtmonuse/$(ARCH)/librtmonuse-tmp.a \ ../shell/$(ARCH)/libshell-tmp.a ../dumpbuf/$(ARCH)/libdumpbuf-tmp.a \ - ../devnull/$(ARCH)/libdevnull-tmp.a ../dummy/$(ARCH)/dummy.rel \ + ../devnull/$(ARCH)/libdevnull-tmp.a ../dummy/$(ARCH)/libdummy-tmp.a \ ../mw-fb/$(ARCH)/libmw-fb-tmp.a $(NETLIBS) $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB) |