* Makefile.in: Don't link strfuncs.o from the Cygwin build dir.

Build it again with __OUTSIDE_CYGWIN__ defined.
This commit is contained in:
Corinna Vinschen 2008-02-04 12:02:26 +00:00
parent 340e2fa504
commit 5556c6209f
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2008-02-03 Brian Dessent <brian@dessent.net>
* Makefile.in: Don't link strfuncs.o from the Cygwin build dir.
Build it again with __OUTSIDE_CYGWIN__ defined.
2007-11-05 Corinna Vinschen <corinna@vinschen.de>
* bsd_helper.cc (tunable_params): Add kern.ipc.shm_allow_removed as

View File

@ -43,7 +43,7 @@ OBJS:= cygserver.o client.o process.o msg.o sem.o shm.o threaded_queue.o \
sysv_msg.o sysv_sem.o sysv_shm.o
LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)}
CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/strfuncs.o $(cygwin_build)/version.o
CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o
CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
@ -67,7 +67,7 @@ libclean:
fullclean: clean libclean
cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS)
cygserver.exe: $(CYGWIN_LIB) $(OBJS) $(CYGWIN_OBJS) strfuncs.o
$(CXX) -o $@ ${wordlist 2,999,$^} -L$(cygwin_build) -lntdll
$(cygwin_build)/%.o: $(cygwin_source)/%.cc
@ -81,6 +81,9 @@ Makefile: Makefile.in configure
lib%.o: %.cc
${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $<
strfuncs.o: $(cygwin_source)/strfuncs.cc
$(COMPILE_CXX) -I$(updir)/cygwin -o $(@D)/$(*F)$o $<
libcygserver.a: $(LIBOBJS)
$(AR) crus $@ $?