summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/mingw/ChangeLog7
-rw-r--r--winsup/mingw/Makefile.in2
-rw-r--r--winsup/mingw/mingwex/Makefile.in4
-rw-r--r--winsup/mingw/profile/Makefile.in2
4 files changed, 11 insertions, 4 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 90a9280f0..2e90a95aa 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-15 Corinna Vinschen <corinna@vinschen.de>
+
+ * Makefile.in (INCLUDES): Temporarily revert previous change.
+ * mingwex/Makefile,in (INCLUDES): Ditto.
+ * profile/Makefile,in (INCLUDES): Ditto.
+ * mingwex/Makefile,in: Drop carg.o dependency.
+
2004-07-14 Christopher Faylor <cgf@timesys.com>
* mingwex/fwide.c: Include <stdio.h> to resolve FILE usage.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index cf399e22c..66b6c3aac 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -99,7 +99,7 @@ LIBM_A=@LIBM_A@
W32API_INCLUDE = @W32API_INCLUDE@
INCLUDES+= -I$(srcdir)/include \
- -isystem$(srcdir)/../include \
+ -I$(srcdir)/../include \
-nostdinc \
-iwithprefixbefore include
ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
index b74755220..10d4db4bd 100644
--- a/winsup/mingw/mingwex/Makefile.in
+++ b/winsup/mingw/mingwex/Makefile.in
@@ -83,7 +83,7 @@ OPTFLAGS= -fomit-frame-pointer
MNO_CYGWIN = @MNO_CYGWIN@
W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES = -I$(srcdir) -isystem$(srcdir)/../include \
+INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-nostdinc \
-iwithprefixbefore include
ALL_CFLAGS = $(CFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
@@ -151,7 +151,7 @@ POSIX_OBJS = \
REPLACE_OBJS = \
mingw-fseek.o
COMPLEX_OBJS = \
- cabs.o cacos.o cacosh.o casin.o casinh.o carg.o catan.o catanh.o \
+ cabs.o cacos.o cacosh.o casin.o casinh.o catan.o catanh.o \
ccos.o ccosh.o cexp.o cimag.o clog.o cpow.o cproj.o creal.o \
csin.o csinh.o csqrt.o ctan.o ctanh.o
diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in
index 5d36b1590..4786fdd16 100644
--- a/winsup/mingw/profile/Makefile.in
+++ b/winsup/mingw/profile/Makefile.in
@@ -48,7 +48,7 @@ THREAD_DLL_VERSION = 10
THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll
W32API_INCLUDE = @W32API_INCLUDE@
-INCLUDES = -I$(srcdir) -isystem$(srcdir)/../include \
+INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
-nostdinc \
-iwithprefixbefore include
ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)