diff options
author | Corinna Vinschen <corinna@vinschen.de> | 2003-11-26 23:05:09 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2003-11-26 23:05:09 +0300 |
commit | a2acbfb14e3e1d145a92c44abbce0398f54a8fd6 (patch) | |
tree | 27c7fe3597bab3fe06aaa6acb3072da05643f611 | |
parent | 0a707c79e9fb7f5f4d4c3ec0d21a559ba848f12a (diff) |
* Makefile.in (CYGWIN_LIB): Variable pointing to libcygwin.a in
the parallel cygwin dir.
(cygserver.exe): Depend on and link against $CYGWIN_LIB.
-rw-r--r-- | winsup/cygserver/ChangeLog | 6 | ||||
-rw-r--r-- | winsup/cygserver/Makefile.in | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index 3ada9bf25..0c60e3525 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,3 +1,9 @@ +2003-11-26 Corinna Vinschen <corinna@vinschen.de> + + * Makefile.in (CYGWIN_LIB): Variable pointing to libcygwin.a in + the parallel cygwin dir. + (cygserver.exe): Depend on and link against $CYGWIN_LIB. + 2003-11-25 Christopher Faylor <cgf@redhat.com> * Makefile.in (CXXFLAGS): Remove duplicate options handled in diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in index fa6960b73..333fcb92b 100644 --- a/winsup/cygserver/Makefile.in +++ b/winsup/cygserver/Makefile.in @@ -46,6 +46,8 @@ LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)} CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \ $(cygwin_build)/wincap.o +CYGWIN_LIB:=$(cygwin_build)/libcygwin.a + all: cygserver.exe install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README @@ -66,7 +68,7 @@ libclean: fullclean: clean libclean -cygserver.exe: $(OBJS) $(CYGWIN_OBJS) +cygserver.exe: $(OBJS) $(CYGWIN_OBJS) $(CYGWIN_LIB) $(CXX) -o $@ $^ $(cygwin_build)/%.o: $(cygwin_source)/%.cc |