+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
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
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
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 $@ $?