On Mon, Feb 8, 2010 at 11:15 PM, Carmelo AMOROSO <[email protected]> wrote: > Update nptl and tls Makefiles according to new sysdep headers structure > > Signed-off-by: Carmelo Amoroso <[email protected]>
Acked-by: Khem Raj <[email protected]> > --- > test/nptl/Makefile | 1 + > test/nptl/Makefile.in | 3 +++ > test/tls/Makefile | 3 ++- > test/tls/Makefile.in | 6 +++++- > 4 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/test/nptl/Makefile b/test/nptl/Makefile > index a99c5d1..c22b635 100644 > --- a/test/nptl/Makefile > +++ b/test/nptl/Makefile > @@ -2,6 +2,7 @@ > # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. > > top_builddir=../../ > +top_srcdir=../../ > include ../Rules.mak > -include Makefile.in > include ../Test.mak > diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in > index 0bca63b..b8e140b 100644 > --- a/test/nptl/Makefile.in > +++ b/test/nptl/Makefile.in > @@ -58,8 +58,11 @@ GLIBC_TESTS_DISABLED += tst-tls3_glibc tst-tls4_glibc > tst-tls5_glibc > endif > > PTDIR := $(top_builddir)libpthread/nptl > +SYSDEPS_DIR := $(top_srcdir)libc/sysdeps > > EXTRA_CFLAGS := -DNOT_IN_libc=1 -D_LIBC -D__USE_GNU -std=gnu99 \ > + -I$(SYSDEPS_DIR)/linux \ > + -I$(SYSDEPS_DIR)/linux/$(TARGET_ARCH) \ > -I$(PTDIR) -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ > -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ > -I$(PTDIR)/sysdeps/unix/sysv/linux \ > diff --git a/test/tls/Makefile b/test/tls/Makefile > index a99c5d1..607fec2 100644 > --- a/test/tls/Makefile > +++ b/test/tls/Makefile > @@ -1,7 +1,8 @@ > -# uClibc NPTL tests > +# uClibc TLS tests > # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. > > top_builddir=../../ > +top_srcdir=../../ > include ../Rules.mak > -include Makefile.in > include ../Test.mak > diff --git a/test/tls/Makefile.in b/test/tls/Makefile.in > index 839824d..d19d347 100644 > --- a/test/tls/Makefile.in > +++ b/test/tls/Makefile.in > @@ -18,9 +18,13 @@ GLIBC_TESTS_DISABLED := $(addsuffix _glibc,$(filter-out > $(TESTS_DISABLED),$(TEST > > > PTDIR := $(top_builddir)libpthread/nptl > +SYSDEPS_DIR := $(top_srcdir)libc/sysdeps > > EXTRA_CFLAGS := -DNOT_IN_libc=1 \ > - -std=gnu99 -I. -I$(PTDIR) \ > + -std=gnu99 -I. \ > + -I$(SYSDEPS_DIR)/linux \ > + -I$(SYSDEPS_DIR)/linux/$(TARGET_ARCH) \ > + -I$(PTDIR) \ > -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ > -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ > -I$(PTDIR)/sysdeps/unix/sysv/linux \ > -- > 1.6.0.6 > > _______________________________________________ > uClibc mailing list > [email protected] > http://lists.busybox.net/mailman/listinfo/uclibc > _______________________________________________ uClibc mailing list [email protected] http://lists.busybox.net/mailman/listinfo/uclibc
