From bb632d57bb792804a18bfcbb723c825de26b23a5 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 29 Aug 2001 00:07:05 +0000
Subject: Minor update

---
 test/Makefile  | 20 ++++++++++++--------
 test/Rules.mak |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'test')

diff --git a/test/Makefile b/test/Makefile
index 2cc365e3f..e9a717d5f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -21,15 +21,19 @@
 # respective copyright holders.
 
 TOPDIR=../
-include $(TOPDIR)Rules.mak
+include $(TOPDIR)Config
+
+.EXPORT_ALL_VARIABLES:
+
 
 ALL_SUBDIRS = args assert ctype pwd_grp signal silly stdlib string unistd #misc
-ifeq ($(TARGET_ARCH), $(NATIVE_ARCH))
-	DIRS = $(ALL_SUBDIRS)
-else
-	DIRS =
-endif
-ifeq ($(DO_SHARED),shared)
+DIRS = $(ALL_SUBDIRS)
+#ifeq ($(TARGET_ARCH), $(NATIVE_ARCH))
+#	DIRS = $(ALL_SUBDIRS)
+#else
+#	DIRS =
+#endif
+ifeq ($(strip $(HAVE_SHARED)),true)
 	DIRS += ldso
 endif	
 
@@ -47,7 +51,7 @@ subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
 $(patsubst %, _dir_%, $(DIRS)) : dummy
 	$(MAKE) -C $(patsubst _dir_%, %, $@)
 
-$(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
+$(patsubst %, _dirclean_%, $(ALL_SUBDIRS) ldso) : dummy
 	$(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
 .PHONY: dummy
diff --git a/test/Rules.mak b/test/Rules.mak
index 33a0e6f5f..a12ba3be6 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -6,6 +6,7 @@
 #Note: This does not read the top level Rules.mak file
 #
 
+include $(TESTDIR)../Config
 include $(TESTDIR)Config
 
 
@@ -47,7 +48,9 @@ endif
 ifneq ($(DODYNAMIC),true)
     LDFLAGS +=--static
 endif
+ifeq ($(strip $(HAVE_SHARED)),true)
 ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
 CFLAGS+=--uclibc-use-build-dir
 LDFLAGS+=--uclibc-use-build-dir
 endif
+endif
-- 
cgit v1.2.3