* Makefile.in (CFLAGS, CXXFLAGS): Remove unneeded include.

(CYGWIN_LIB): Delete.
(cygserver.exe target): Add -L$(cygwin_build) to the link line to force linker
to use build tree version of the library.  Remove specific inclusion of
libcygwin.a from the link line.

diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 8a08037..7bd35cf 100644 (file)
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-26  Christopher Faylor  <cgf@redhat.com>
+
+       * Makefile.in (CFLAGS, CXXFLAGS): Remove unneeded include.
+       (CYGWIN_LIB): Delete.
+       (cygserver.exe target): Add -L$(cygwin_build) to the link line to force
+       linker to use build tree version of the library.  Remove specific
+       inclusion of libcygwin.a from the link line.
+
 2003-12-16  Corinna Vinschen  <corinna@vinschen.de>
 
        * bsd_helper.cc (tunable_params): Add entries for kern.ipc.msgmnb and

diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index 333fcb9..1b76a76 100644 (file)
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -31,8 +31,8 @@ AR:=@AR@
 
 include $(srcdir)/../Makefile.common
 
-CFLAGS:=@CFLAGS@ -I$(cygwin_source)
-CXXFLAGS:=@CXXFLAGS@ -I$(cygwin_source)
+CFLAGS:=@CFLAGS@
+CXXFLAGS:=@CXXFLAGS@
 override CXXFLAGS+=-MMD -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\""
 
 .SUFFIXES: .c .cc .a .o .d
@@ -68,8 +68,8 @@ libclean:
 
 fullclean: clean libclean
 
-cygserver.exe: $(OBJS) $(CYGWIN_OBJS) $(CYGWIN_LIB)
-       $(CXX) -o $@ $^
+cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS)
+       $(CXX) -o $@ ${wordlist 2,999,$^} -L$(cygwin_build)
 
 $(cygwin_build)/%.o: $(cygwin_source)/%.cc
        @$(MAKE) -C $(@D) $(@F)