From 596a7ea5d659552f14be68fab844a8ec5b8fe9c8 Mon Sep 17 00:00:00 2001
From: Jennifer Averett <jennifer.averett@oarcorp.com>
Date: Wed, 16 May 2012 10:21:12 -0500
Subject: Standardized Makefiles so that i386 would build correctly.

---
 testsuite/swi01/Makefile | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'testsuite/swi01')

diff --git a/testsuite/swi01/Makefile b/testsuite/swi01/Makefile
index dd7c6882..f5de48f4 100644
--- a/testsuite/swi01/Makefile
+++ b/testsuite/swi01/Makefile
@@ -1,29 +1,27 @@
 include ../../config.inc
 
-include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
-include $(RTEMS_CUSTOM)
-include $(PROJECT_ROOT)/make/leaf.cfg
-
-APP_PIECES = init swi_test
-
-APP_O_FILES = $(APP_PIECES:%=%.o)
-APP_DEP_FILES = $(APP_PIECES:%=%.dep)
+APP=swi01
+PGM=${ARCH}/$(APP).exe
 
-APP = app.exe
+# optional managers required
+MANAGERS=all
 
-DEPFLAGS = -MT $@ -MD -MP -MF $*.dep
-AM_CPPFLAGS += -I $(INSTALL_BASE)/include -I.
+# C source names
+C_FILES = init.c swi_test.c
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
-CFLAGS += $(DEPFLAGS) $(GCCFLAGS) $(AM_CPPFLAGS) -Wno-unused -Wl,-Map,app.map
+AM_CPPFLAGS += -I $(INSTALL_BASE)/include
+LINK_LIBS += $(INSTALL_BASE)/libbsd.a ${REL_ARGS}
+CFLAGS += $(DEPFLAGS) $(GCCFLAGS) $(AM_CPPFLAGS) -Wno-unused -Wl,-Map,$(APP).map
 
-LINK_LIBS += $(INSTALL_BASE)/libbsd.a
-
-all: $(APP)
+include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
+include $(RTEMS_CUSTOM)
+include $(PROJECT_ROOT)/make/leaf.cfg
 
-$(APP): $(APP_O_FILES)
-	$(CC) $(CFLAGS) $^ $(LINK_LIBS) -o $(APP)
+OBJS= $(C_O_FILES)
+CLEAN_ADDITIONS += $(APP).map
 
-clean:
-	rm -f app.map $(APP) $(APP_O_FILES) $(APP_DEP_FILES)
+all:    ${ARCH} $(PGM)
 
--include $(APP_DEP_FILES)
+$(PGM): $(OBJS)
+	-$(make-exe)
-- 
cgit v1.2.3