diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-12-26 05:37:54 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-12-26 05:37:54 +0000 |
| commit | 91301b852f178803c696706bd2b40d98f932645c (patch) | |
| tree | 2d3015613060e04a1f66adb05a0c82a2a8162087 | |
| parent | 76832a5b32dd03a995e5c9c58b84da2ac5c6b26c (diff) | |
| download | newlib-91301b852f178803c696706bd2b40d98f932645c.zip newlib-91301b852f178803c696706bd2b40d98f932645c.tar.gz newlib-91301b852f178803c696706bd2b40d98f932645c.tar.bz2 | |
* 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.
| -rw-r--r-- | winsup/cygserver/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygserver/Makefile.in | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index 8a08037..7bd35cf 100644 --- 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 --- 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) |