diff options
Diffstat (limited to 'winsup/cygwin/Makefile.in')
| -rw-r--r-- | winsup/cygwin/Makefile.in | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in index 4c433ff94..6fd0882f7 100644 --- a/winsup/cygwin/Makefile.in +++ b/winsup/cygwin/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in for Cygwin. # Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Red Hat, Inc. +# 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. # # This file is part of Cygwin. # @@ -55,7 +55,7 @@ CC:=@CC@ # FIXME: Which is it, CC or CC_FOR_TARGET? CC_FOR_TARGET:=$(CC) CFLAGS=@CFLAGS@ -override CFLAGS+=-MMD ${$(*F)_CFLAGS} -fmerge-constants -ftracer $(CCEXTRA) +override CFLAGS+=-MMD ${$(*F)_CFLAGS} -Werror -fmerge-constants -ftracer $(CCEXTRA) CXX=@CXX@ override CXXFLAGS=@CXXFLAGS@ @@ -98,6 +98,7 @@ RUNTESTFLAGS = DLL_NAME:=cygwin1.dll TEST_DLL_NAME:=cygwin0.dll TEST_LIB_NAME:=libcygwin0.a +STATIC_LIB_NAME:=libcygwin_s.a DEF_FILE:=cygwin.def DLL_ENTRY:=@DLL_ENTRY@ @@ -135,7 +136,7 @@ DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.o \ fhandler_registry.o fhandler_serial.o fhandler_socket.o fhandler_tape.o \ fhandler_termios.o fhandler_tty.o fhandler_virtual.o fhandler_windows.o \ fhandler_zero.o flock.o fnmatch.o fork.o fts.o ftw.o getopt.o glob.o \ - glob_pattern_p.o grp.o heap.o hookapi.o inet_addr.o inet_network.o \ + glob_pattern_p.o globals.o grp.o heap.o hookapi.o inet_addr.o inet_network.o \ init.o ioctl.o ipc.o kernel32.o localtime.o lsearch.o malloc_wrapper.o \ minires-os-if.o minires.o miscfuncs.o mktemp.o mmap.o msg.o mount.o \ net.o netdb.o nfs.o nftw.o ntea.o passwd.o path.o pinfo.o pipe.o \ @@ -149,6 +150,15 @@ DLL_OFILES:=assert.o autoload.o bsdlib.o ctype.o cxx.o cygheap.o cygthread.o \ xsique.o \ $(EXTRA_DLL_OFILES) $(EXTRA_OFILES) $(MALLOC_OFILES) $(MT_SAFE_OBJECTS) +EXCLUDE_STATIC_OFILES:=$(addprefix --exclude=,\ + cygtls.o \ + dcrt0.o \ + exceptions.o \ + fork.o \ + signal.o \ + spawn.o \ +) + GMON_OFILES:=gmon.o mcount.o profil.o OBSOLETE_FUNCTIONS:=open acl aclcheck aclfrommode aclfrompbits \ @@ -381,7 +391,7 @@ $(TEST_DLL_NAME): $(LDSCRIPT) dllfixdbg $(DLL_OFILES) $(DLL_IMPORTS) $(LIBSERVER -Wl,--heap=0 -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ $(MALLOC_OBJ) $(LIBSERVER) $(LIBM) $(LIBC) \ - -lgcc $(DLL_IMPORTS) + -lgcc $(DLL_IMPORTS) -Wl,-Map,cygwin.map @$(word 2,$^) $(OBJDUMP) $(OBJCOPY) $@ ${patsubst %0.dll,%1.dbg,$@} @ln -f $@ new-$(DLL_NAME) @@ -392,6 +402,9 @@ $(LIB_NAME): rmsym newsym $(TEST_DLL_NAME) $(LIBCOS) (echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M $(RANLIB) $@ +${STATIC_LIB_NAME}: mkstatic ${TEST_DLL_NAME} + perl -d $< -x ${EXCLUDE_STATIC_OFILES} --library=${LIBC} --library=${LIBM} --ar=${AR} $@ cygwin.map + # Rule to make stub library used by testsuite # dependency set to $(LIB_NAME) to accommodate make -j2. # Otherwise dlltool gets confused. cgf (11-16-2000) @@ -412,8 +425,13 @@ $(API_VER): $(srcdir)/cygwin.din version.cc winver.o: winver_stamp @ : +globals.h: mkglobals_h globals.cc + $^ > $@ + +${DLL_OFILES}: globals.h + shared_info_magic.h: cygmagic shared_info.h - /bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} USER_MAGIC 'class user_info' SHARED_MAGIC 'class shared_info' + /bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info' child_info_magic.h: cygmagic child_info.h /bin/sh ${word 1,$^} $@ "$(CC) -x c" ${word 2,$^} CHILD_INFO_MAGIC 'class child_info' @@ -429,22 +447,22 @@ $(srcdir)/devices.cc: gendevices devices.in devices.h ${wordlist 1,2,$^} $@ $(PWD)/libpthread.a: speclib $(LIB_NAME) pthread.o thread.o - /bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} + ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} $(PWD)/libutil.a: speclib $(LIB_NAME) bsdlib.o - /bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} + ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} $(PWD)/libm.a: speclib $(LIB_NAME) $(LIBM) - /bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} + ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} $(PWD)/libc.a: speclib $(LIB_NAME) $(PWD)/libm.a libpthread.a libutil.a - /bin/sh ${word 1, $^} -v $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} + ${word 1, $^} -v $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} $(PWD)/libdl.a: speclib $(LIB_NAME) dlfcn.o - /bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} + ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} $(PWD)/libresolv.a: speclib $(LIB_NAME) minires.o - /bin/sh ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} + ${word 1, $^} $@ "${NM}" "$(AR)" ${wordlist 2, 99, $^} lib%.a: %.o $(AR) cru $@ $? @@ -469,7 +487,7 @@ sigfe.s: $(DEF_FILE) [ -s $@ ] && touch $@ sigfe.o: sigfe.s - $(CC) -c -o $@ $? + $(CC) -c -o $@ $< winsup.h: config.h |