diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2007-02-14 23:42:07 +0000 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2007-02-14 23:42:07 +0000 |
| commit | 18c27356c4618fa6a99cfce31bf255a33e88ba9e (patch) | |
| tree | c28d9d579ca51bf1b6613cd3909a6abcdb338064 | |
| parent | 958e329d59aafd6eabb10884c6b86861197beb4f (diff) | |
| download | cygnal-18c27356c4618fa6a99cfce31bf255a33e88ba9e.tar.gz cygnal-18c27356c4618fa6a99cfce31bf255a33e88ba9e.tar.bz2 cygnal-18c27356c4618fa6a99cfce31bf255a33e88ba9e.zip | |
* Makefile.in (ALL_CFLAGS): Put W32API_INCLUDE after INCLUDES.
(ALL_CXXFLAGS): Likewise.
* mingwex/Makefile.in (ALL_CFLAGS): Put W32API_INCLUDE after INCLUDES.
(ALL_CXXFLAGS): Likewise.
* profile/Makefile.in (ALL_CFLAGS): Put W32API_INCLUDE after INCLUDES.
(ALL_CXXFLAGS): Likewise.
| -rw-r--r-- | winsup/mingw/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/mingw/Makefile.in | 6 | ||||
| -rw-r--r-- | winsup/mingw/mingwex/Makefile.in | 4 | ||||
| -rw-r--r-- | winsup/mingw/profile/Makefile.in | 4 |
4 files changed, 16 insertions, 7 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index a7d9ae53a..810634029 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,12 @@ +2007-02-15 Danny Smith <dannysmith@users.sourceforge.net> + + * Makefile.in (ALL_CFLAGS): Put W32API_INCLUDE after INCLUDES. + (ALL_CXXFLAGS): Likewise. + * mingwex/Makefile.in (ALL_CFLAGS): Put W32API_INCLUDE after INCLUDES. + (ALL_CXXFLAGS): Likewise. + * profile/Makefile.in (ALL_CFLAGS): Put W32API_INCLUDE after INCLUDES. + (ALL_CXXFLAGS): Likewise. + 2007-02-08 Danny Smith <dannysmith@users.sourceforge.net> * include/io.h (X_OK): Revert 2007-01-24 change, but leave comment. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 786f2e27c..ccbc33917 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -109,12 +109,12 @@ THREAD_DLL_NAME = $(THREAD_DLL)$(THREAD_DLL_VERSION).dll LIBM_A=@LIBM_A@ W32API_INCLUDE = @W32API_INCLUDE@ -INCLUDES+= -I$(srcdir)/include \ +INCLUDES = -I$(srcdir)/include \ -I$(srcdir)/../include \ -nostdinc \ -iwithprefixbefore include -ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) -ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN) +ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN) +ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN) AS = @AS@ AR = @AR@ diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in index a8e007dae..15f110c60 100644 --- a/winsup/mingw/mingwex/Makefile.in +++ b/winsup/mingw/mingwex/Makefile.in @@ -108,8 +108,8 @@ W32API_INCLUDE = @W32API_INCLUDE@ INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../include \ -nostdinc \ -iwithprefixbefore include -ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) -ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN) +ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN) +ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN) AS = @AS@ AR = @AR@ diff --git a/winsup/mingw/profile/Makefile.in b/winsup/mingw/profile/Makefile.in index 5afe58aa4..e8ff8d1ef 100644 --- a/winsup/mingw/profile/Makefile.in +++ b/winsup/mingw/profile/Makefile.in @@ -51,8 +51,8 @@ W32API_INCLUDE = @W32API_INCLUDE@ INCLUDES = -I$(srcdir) -I$(srcdir)/../include \ -nostdinc \ -iwithprefixbefore include -ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN) -ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN) +ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE) $(MNO_CYGWIN) +ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE) $(MNO_CYGWIN) AS = @AS@ AR = @AR@ |