6 files changed, 24 insertions, 20 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)
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index 75fac524c0..334a3edfcc 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/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/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
index 22fa3c7650..ddabdfbf0d 100644
--- a/cpukit/libmisc/dummy/Makefile.am
+++ b/cpukit/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/cpukit/libmisc/wrapup/Makefile.am b/cpukit/libmisc/wrapup/Makefile.am
index d94952fe80..c0313b140c 100644
--- a/cpukit/libmisc/wrapup/Makefile.am
+++ b/cpukit/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)