From 5c65b9881bec47e322607a9a63c83d1a229c1710 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Mon, 9 Apr 2018 13:39:19 +1000
Subject: testsuite/libtests: Merged nested Makefile.am files into one
 Makefile.am

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/libtests/dl05/Makefile.am | 47 ------------------------------------
 testsuites/libtests/dl05/init.c      |  6 ++---
 2 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 testsuites/libtests/dl05/Makefile.am

(limited to 'testsuites/libtests/dl05')

diff --git a/testsuites/libtests/dl05/Makefile.am b/testsuites/libtests/dl05/Makefile.am
deleted file mode 100644
index 8d2ddee638..0000000000
--- a/testsuites/libtests/dl05/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-rtems_tests_PROGRAMS = dl05
-dl05_SOURCES = init.c dl-load.c dl-cpp.cpp dl-tar.c dl-tar.h
-
-BUILT_SOURCES = dl-tar.c dl-tar.h
-
-dist_rtems_tests_DATA = dl05.scn dl05.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dl05_OBJECTS)
-LINK_LIBS = $(dl05_LDLIBS)
-
-init.$(OBJEXT): dl-tar.h
-
-dl-o5.o: dl-o5.cpp
-
-dl.tar: dl-o5.o
-	@rm -f $@
-	$(PAX) -w -f $@ $<
-CLEANFILES += dl.tar
-
-dl-tar.c: dl.tar
-	$(BIN2C) -C $< $@
-CLEANFILES += dl-tar.c
-
-dl-tar.h: dl.tar
-	$(BIN2C) -H $< $@
-CLEANFILES += dl-tar.h
-
-dl05.pre: $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
-	@rm -f dl05.pre
-	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $@ $(LINK_OBJS) $(LINK_LIBS)
-
-dl-sym.o: dl05.pre
-	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
-
-dl05$(EXEEXT):  $(dl05_OBJECTS) $(dl05_DEPENDENCIES) dl-sym.o
-	@rm -f dl05$(EXEEXT)
-	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) dl-sym.o $(LINK_LIBS)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c
index cb19de13f2..028aae6039 100644
--- a/testsuites/libtests/dl05/init.c
+++ b/testsuites/libtests/dl05/init.c
@@ -27,10 +27,10 @@ const char rtems_test_name[] = "libdl (RTL) 5";
 /* forward declarations to avoid warnings */
 static rtems_task Init(rtems_task_argument argument);
 
-#include "dl-tar.h"
+#include "dl05-tar.h"
 
-#define TARFILE_START dl_tar
-#define TARFILE_SIZE  dl_tar_size
+#define TARFILE_START dl05_tar
+#define TARFILE_SIZE  dl05_tar_size
 
 static int test(void)
 {
-- 
cgit v1.2.3