* Makefile.in: Build libcygserver.a.

* client.cc: Rename allow_daemon to allow_server.
This commit is contained in:
Christopher Faylor 2003-08-25 18:22:07 +00:00
parent 4392d36cbb
commit 29c1c50828
3 changed files with 16 additions and 6 deletions

View File

@ -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> 2003-07-25 Christopher Faylor <cgf@redhat.com>
* configure.in: Use 'install-sh -c'. * configure.in: Use 'install-sh -c'.

View File

@ -29,6 +29,7 @@ CC:=@CC@
CC_FOR_TARGET:=$(CC) CC_FOR_TARGET:=$(CC)
CXX:=@CXX@ CXX:=@CXX@
CXX_FOR_TARGET:=$(CXX) CXX_FOR_TARGET:=$(CXX)
AR:=@AR@
CFLAGS:=@CFLAGS@ -I$(cygwin_source) CFLAGS:=@CFLAGS@ -I$(cygwin_source)
CXXFLAGS:=@CXXFLAGS@ -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 \ OBJS:= cygserver.o client.o process.o shm.o threaded_queue.o transport.o \
transport_pipes.o transport_sockets.o transport_pipes.o transport_sockets.o
LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)}
CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \ CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \
$(cygwin_build)/wincap.o $(cygwin_build)/wincap.o
all: cygserver.exe all: cygserver.exe libcygserver.a
install: all install: all
@ -59,3 +61,9 @@ $(cygwin_build)/%.o: $(cygwin_source)/%.c
@$(MAKE) -C $(@D) $(@F) @$(MAKE) -C $(@D) $(@F)
Makefile: Makefile.in configure 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 $@ $?

View File

@ -30,10 +30,7 @@ details. */
int cygserver_running = CYGSERVER_UNKNOWN; // Nb: inherited by children. int cygserver_running = CYGSERVER_UNKNOWN; // Nb: inherited by children.
/* On by default during development. For release, we probably want off bool allow_server = false; // Nb: inherited by children.
* by default.
*/
bool allow_daemon = true; // Nb: inherited by children.
client_request_get_version::client_request_get_version () client_request_get_version::client_request_get_version ()
: client_request (CYGSERVER_REQUEST_GET_VERSION, &version, sizeof (version)) : client_request (CYGSERVER_REQUEST_GET_VERSION, &version, sizeof (version))
@ -509,7 +506,7 @@ check_cygserver_available ()
void void
cygserver_init () cygserver_init ()
{ {
if (!allow_daemon) if (!allow_server)
{ {
syscall_printf ("cygserver use disabled in client"); syscall_printf ("cygserver use disabled in client");
cygserver_running = CYGSERVER_UNAVAIL; cygserver_running = CYGSERVER_UNAVAIL;