summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2012-11-28 03:23:41 +0000
committerChristopher Faylor <me@cgf.cx>2012-11-28 03:23:41 +0000
commit065b05f2df10becbda089c28a2285f0aef51950d (patch)
tree756d74f836668da318f9fbc7193c40a861b81973
parent29413f0630f13279a938d68c11a36e8c137538f5 (diff)
downloadcygnal-065b05f2df10becbda089c28a2285f0aef51950d.tar.gz
cygnal-065b05f2df10becbda089c28a2285f0aef51950d.tar.bz2
cygnal-065b05f2df10becbda089c28a2285f0aef51950d.zip
* Makefile.in: Remove old from CFLAGS and move C*FLAGS so that they can be
manipulated by Makefile.common.
-rw-r--r--winsup/cygserver/ChangeLog5
-rw-r--r--winsup/cygserver/Makefile.in7
2 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 962531d26..76b6c27db 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-27 Christopher Faylor <me.cygwin2012@cgf.cx>
+
+ * Makefile.in: Remove old from CFLAGS and move C*FLAGS so that they can
+ be manipulated by Makefile.common.
+
2012-11-26 Christopher Faylor <me.cygwin2012@cgf.cx>
* configure.ac: Rename from configure.in.
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index e633e9b01..e98dea2e6 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -15,6 +15,10 @@ configure_args=@configure_args@
export CC:=@CC@
export CXX:=@CXX@
+CFLAGS:=@CFLAGS@
+override CXXFLAGS=@CXXFLAGS@
+override CXXFLAGS+=-MMD -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\""
+
include ${srcdir}/../Makefile.common
cygwin_build:=${target_builddir}/winsup/cygwin
@@ -38,9 +42,6 @@ INSTALL_DATA:=@INSTALL_DATA@
AR:=@AR@
-CFLAGS:=@CFLAGS@
-override CXXFLAGS=@CXXFLAGS@
-override CXXFLAGS+=-MMD -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\""
OBJS:= cygserver.o client.o process.o msg.o sem.o shm.o threaded_queue.o \
transport.o transport_pipes.o \