summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2007-08-02 14:23:22 +0000
committerChristopher Faylor <me@cgf.cx>2007-08-02 14:23:22 +0000
commitde16566998f1748f12cd4a5650bdd57bd6a18b89 (patch)
tree6e80b3f9372b1344abda15ab90932725d9e92735
parent7e4f1942e4a3a3d1477dcffd5b45255007ed13d4 (diff)
downloadcygnal-de16566998f1748f12cd4a5650bdd57bd6a18b89.tar.gz
cygnal-de16566998f1748f12cd4a5650bdd57bd6a18b89.tar.bz2
cygnal-de16566998f1748f12cd4a5650bdd57bd6a18b89.zip
* Makefile.in: Add -lntdll to link line.
(CYGWIN_OBJS): Include strfuncs.o.
-rw-r--r--winsup/cygserver/ChangeLog5
-rw-r--r--winsup/cygserver/Makefile.in6
2 files changed, 8 insertions, 3 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index fbfc7969d..00eadd098 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-02 Christopher Faylor <me+cygwin@cgf.cx>
+
+ * Makefile.in: Add -lntdll to link line.
+ (CYGWIN_OBJS): Include strfuncs.o.
+
2007-08-02 Corinna Vinschen <corinna@vinschen.de>
* smallprint.c: New file.
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index b12ff2083..0671432ec 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -38,12 +38,12 @@ override CXXFLAGS+=-MMD -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="
.SUFFIXES: .c .cc .a .o .d
OBJS:= cygserver.o client.o process.o msg.o sem.o shm.o threaded_queue.o \
- transport.o transport_pipes.o smallprint.o \
+ transport.o transport_pipes.o \
bsd_helper.o bsd_log.o bsd_mutex.o \
sysv_msg.o sysv_sem.o sysv_shm.o
LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)}
-CYGWIN_OBJS:=$(cygwin_build)/version.o
+CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/strfuncs.o $(cygwin_build)/version.o
CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
@@ -68,7 +68,7 @@ libclean:
fullclean: clean libclean
cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS)
- $(CXX) -o $@ ${wordlist 2,999,$^} -L$(cygwin_build)
+ $(CXX) -o $@ ${wordlist 2,999,$^} -L$(cygwin_build) -lntdll
$(cygwin_build)/%.o: $(cygwin_source)/%.cc
@$(MAKE) -C $(@D) $(@F)