summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile15
2 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b67933e..6183909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-19 Thomas Schwinge <tschwinge@gnu.org>
+
+ * Makefile (CFLAGS): Don't set and instead...
+ (CPPFLAGS): ... append the inclusion stuff to these.
+
2007-08-02 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/generic/bits/mutex.h (pthread_mutex_init)
diff --git a/Makefile b/Makefile
index 3c5631a..0c1542e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 1994,95,96,97,2000,02, 2004, 2005, 2006
+# Copyright (C) 1994, 1995, 1996, 1997, 2000, 2002, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
@@ -169,16 +169,17 @@ VPATH += $(SYSDEP_PATH)
HURDLIBS = ihash
-CFLAGS := -D_IO_MTSAFE_IO \
- $(addprefix -I, $(SYSDEP_PATH)) \
- -imacros $(srcdir)/include/libc-symbols.h \
- -imacros $(srcdir)/not-in-libc.h
-
installhdrs :=
-installhdrsubdir = .
+installhdrsubdir := .
include ../Makeconf
+CPPFLAGS += \
+ $(addprefix -I, $(SYSDEP_PATH)) \
+ -imacros $(srcdir)/include/libc-symbols.h \
+ -imacros $(srcdir)/not-in-libc.h
+
+
install: install-headers $(libdir)/libpthread2.a $(libdir)/libpthread2_pic.a
install-headers: $(addprefix $(includedir)/, $(sysdeps_headers))