diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-08-25 22:22:07 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-08-25 22:22:07 +0400 |
| commit | 29c1c50828233ceef69bd54b80104b45ac9a57fb (patch) | |
| tree | 86fa8a02e5d3820a11f0aa442473a31904dfae9b | |
| parent | 4392d36cbb8ba8dae24eca82c445d807497d69ff (diff) | |
* Makefile.in: Build libcygserver.a.
* client.cc: Rename allow_daemon to allow_server.
| -rw-r--r-- | winsup/cygserver/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygserver/Makefile.in | 10 | ||||
| -rw-r--r-- | winsup/cygserver/client.cc | 7 |
3 files changed, 16 insertions, 6 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index eca6119ab..fcc3b28a5 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,3 +1,8 @@ +2003-08-25 Christopher Faylor <cgf@redhat.com> + + * Makefile.in: Build libcygserver.a. + * client.cc: Rename allow_daemon to allow_server. + 2003-07-25 Christopher Faylor <cgf@redhat.com> * configure.in: Use 'install-sh -c'. diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in index eb326aaed..b0396340a 100644 --- a/winsup/cygserver/Makefile.in +++ b/winsup/cygserver/Makefile.in @@ -29,6 +29,7 @@ CC:=@CC@ CC_FOR_TARGET:=$(CC) CXX:=@CXX@ CXX_FOR_TARGET:=$(CXX) +AR:=@AR@ CFLAGS:=@CFLAGS@ -I$(cygwin_source) CXXFLAGS:=@CXXFLAGS@ -I$(cygwin_source) @@ -38,11 +39,12 @@ include $(srcdir)/../Makefile.common OBJS:= cygserver.o client.o process.o shm.o threaded_queue.o transport.o \ transport_pipes.o transport_sockets.o +LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)} CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \ $(cygwin_build)/wincap.o -all: cygserver.exe +all: cygserver.exe libcygserver.a install: all @@ -59,3 +61,9 @@ $(cygwin_build)/%.o: $(cygwin_source)/%.c @$(MAKE) -C $(@D) $(@F) Makefile: Makefile.in configure + +lib%.o: %.cc + ${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $< + +libcygserver.a: $(LIBOBJS) + $(AR) crus $@ $? diff --git a/winsup/cygserver/client.cc b/winsup/cygserver/client.cc index f6683182d..eedc6769b 100644 --- a/winsup/cygserver/client.cc +++ b/winsup/cygserver/client.cc @@ -30,10 +30,7 @@ details. */ int cygserver_running = CYGSERVER_UNKNOWN; // Nb: inherited by children. -/* On by default during development. For release, we probably want off - * by default. - */ -bool allow_daemon = true; // Nb: inherited by children. +bool allow_server = false; // Nb: inherited by children. client_request_get_version::client_request_get_version () : client_request (CYGSERVER_REQUEST_GET_VERSION, &version, sizeof (version)) @@ -509,7 +506,7 @@ check_cygserver_available () void cygserver_init () { - if (!allow_daemon) + if (!allow_server) { syscall_printf ("cygserver use disabled in client"); cygserver_running = CYGSERVER_UNAVAIL; |