From 4d8d80b8a7a9ea21f5a90d912741267b11c50d22 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Wed, 2 Jul 2003 02:31:32 +0000
Subject: * Makefile.in (OBJS): Move some more files from cygwin directory. *
 woutsup.h: Define _MT_SAFE.

---
 winsup/cygserver/ChangeLog   |  5 +++++
 winsup/cygserver/Makefile.in | 19 +++++++++++++++----
 winsup/cygserver/woutsup.h   |  4 +---
 3 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'winsup/cygserver')

diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 36cf66305..b682f5d02 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-01  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in (OBJS): Move some more files from cygwin directory.
+	* woutsup.h: Define _MT_SAFE.
+
 2003-07-01  Christopher Faylor  <cgf@redhat.com>
 
 	* configure.in: First pass.
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index beda6279f..eb326aaed 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -32,12 +32,12 @@ CXX_FOR_TARGET:=$(CXX)
 
 CFLAGS:=@CFLAGS@ -I$(cygwin_source)
 CXXFLAGS:=@CXXFLAGS@ -I$(cygwin_source)
-override CXXFLAGS+=-fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0
+override CXXFLAGS+=-fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__
 
 include $(srcdir)/../Makefile.common
 
-OBJS:=	cygserver.o client.o process.o shm.o transport.o transport_pipes.o \
-	transport_sockets.o
+OBJS:=	cygserver.o client.o process.o shm.o threaded_queue.o transport.o \
+	transport_pipes.o transport_sockets.o
 
 CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \
 	$(cygwin_build)/wincap.o
@@ -46,5 +46,16 @@ all: cygserver.exe
 
 install: all
 
+clean:
+	rm -f $(OBJS)
+
 cygserver.exe: $(OBJS) $(CYGWIN_OBJS)
-	$(CXX) -o $@ $^ -lstdc++
+	$(CXX) -o $@ $^
+
+$(cygwin_build)/%.o: $(cygwin_source)/%.cc
+	@$(MAKE) -C $(@D) $(@F)
+
+$(cygwin_build)/%.o: $(cygwin_source)/%.c
+	@$(MAKE) -C $(@D) $(@F)
+
+Makefile: Makefile.in configure
diff --git a/winsup/cygserver/woutsup.h b/winsup/cygserver/woutsup.h
index c048f1c19..cb67c78d4 100644
--- a/winsup/cygserver/woutsup.h
+++ b/winsup/cygserver/woutsup.h
@@ -8,9 +8,7 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#define _MT_SAFE 1
 
 #ifdef __INSIDE_CYGWIN__
 #error "woutsup.h is not for code being compiled inside the dll"
-- 
cgit v1.2.3