svn commit: trunk/uClibc/test

vapier at uclibc.org vapier at uclibc.org
Sat Dec 16 19:13:21 UTC 2006


Author: vapier
Date: 2006-12-16 11:13:21 -0800 (Sat, 16 Dec 2006)
New Revision: 16972

Log:
start pulling in top level Rules.mak so we get access to import CFLAGS/LDFLAGS/CPPFLAGS

Modified:
   trunk/uClibc/test/Makefile
   trunk/uClibc/test/Rules.mak
   trunk/uClibc/test/Test.mak


Changeset:
Modified: trunk/uClibc/test/Makefile
===================================================================
--- trunk/uClibc/test/Makefile	2006-12-16 19:12:45 UTC (rev 16971)
+++ trunk/uClibc/test/Makefile	2006-12-16 19:13:21 UTC (rev 16972)
@@ -6,7 +6,6 @@
 #
 
 top_builddir=../
--include $(top_builddir).config
 include Rules.mak
 
 ALL_SUBDIRS := $(patsubst %/Makefile,%,$(wildcard */Makefile))

Modified: trunk/uClibc/test/Rules.mak
===================================================================
--- trunk/uClibc/test/Rules.mak	2006-12-16 19:12:45 UTC (rev 16971)
+++ trunk/uClibc/test/Rules.mak	2006-12-16 19:13:21 UTC (rev 16972)
@@ -9,10 +9,10 @@
 # Note: This does not read the top level Rules.mak file
 #
 
-top_builddir = ../../
+top_builddir ?= ../
 TESTDIR=$(top_builddir)test/
 
--include $(top_builddir).config
+include $(top_builddir)/Rules.mak
 
 UCLIBC_LDSO ?= $(firstword $(wildcard $(top_builddir)lib/ld*))
 
@@ -69,11 +69,12 @@
 endif
 
 XWARNINGS      := $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes
-XARCH_CFLAGS   := $(subst ",, $(strip $(ARCH_CFLAGS)))
+XARCH_CFLAGS   := $(subst ",, $(strip $(ARCH_CFLAGS))) $(CPU_CFLAGS)
 XCOMMON_CFLAGS := -D_GNU_SOURCE -I$(top_builddir)test
-CFLAGS         += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -I$(top_builddir)include
+CFLAGS         += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -I$(top_builddir)include $(PTINC)
 HOST_CFLAGS    += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS)
 
+LDFLAGS        := $(CPU_LDFLAGS)
 ifeq ($(DODEBUG),y)
 	CFLAGS        += -g
 	HOST_CFLAGS   += -g

Modified: trunk/uClibc/test/Test.mak
===================================================================
--- trunk/uClibc/test/Test.mak	2006-12-16 19:12:45 UTC (rev 16971)
+++ trunk/uClibc/test/Test.mak	2006-12-16 19:13:21 UTC (rev 16972)
@@ -18,6 +18,7 @@
 $(error Sanity check: cannot have a test named "test.c")
 endif
 
+top_builddir = ../../
 include ../Rules.mak
 
 U_TARGETS := $(TESTS)




More information about the uClibc-cvs mailing list