From 4392d36cbb8ba8dae24eca82c445d807497d69ff Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 25 Aug 2003 18:21:07 +0000 Subject: Throughout, change USE_CYGSERVER to USE_SERVER. * Makefile.in (LIBSERVER): Define and use. * configure.in: Set LIBSERVER as appropriate. * environ.cc: Rename allow_daemon to allow_server. Only recognize when USE_SERVER is defined. --- winsup/cygwin/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/Makefile.in') diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 66e72cc58..6a54a1cc3 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -233,6 +233,7 @@ API_VER:=$(srcdir)/include/cygwin/version.h PWD:=${shell pwd} LIB_NAME:=$(PWD)/libcygwin.a +LIBSERVER:=@LIBSERVER@ SUBLIBS:=$(PWD)/libpthread.a $(PWD)/libm.a $(PWD)/libc.a EXTRALIBS:=libautomode.a libbinmode.a libtextmode.a INSTOBJS:=automode.o binmode.o textmode.o @@ -334,10 +335,10 @@ maintainer-clean realclean: clean # Rule to build cygwin.dll -$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp +$(TEST_DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBSERVER) $(LIBC) $(LIBM) $(API_VER) Makefile winver_stamp $(CXX) $(CXXFLAGS) $(nostdlib) -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ - $(MALLOC_OBJ) $(LIBM) $(LIBC) \ + $(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \ -lgcc $(DLL_IMPORTS) @ln -f $@ new-$(DLL_NAME) -- cgit v1.2.3