From 4c36016b570670b75fa2f9f396fb297a04fd09bd Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 23 Nov 2012 13:22:47 +0000 Subject: ChangeLog: 2012-11-12 Christopher Faylor * Makefile.common: Revamp for new configury. Add default compilation targets, include .E processing. Add magic for allowing "CFLAGS" to control optimization options in "CXXFLAGS". * configure.cygwin: New include for Cygwin configure.in's. * acinclude.m4: Delete old definitions. Implement AC_WINDOWS_HEADERS, AC_WINDOWS_LIBS, AC_CYGWIN_INCLUDES, target_builddir, winsup_srcdir. * aclocal.m4: Regenerate. * autogen.sh: New file. * ccwrap: New script. * c++wrap: New script. * config.guess: New script. * config.sub: New script. * configure: Regenerate. * configure.in: Eliminate LIB_AC_PROG_* calls in favor of standard. Delete ancient target test. * install-sh: New script. cygserver/ChangeLog: 2012-11-12 Christopher Faylor * Makefile.in: Revamp for new configury. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. cygwin/ChangeLog: 2012-11-22 Christopher Faylor * select.cc (select): Don't return -1 when we've timed out after looping. 2012-11-22 Christopher Faylor * Makefile.in: Revamp for new configury. (datarootdir): Add variable setting. (winver_stamp): Accommodate changes to mkvers.sh setting. (libc.a): Fix race when libm.a might not have been built yet. * configure.in: Revamp for new configury. * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * mkvers.sh: Find include directives via CFLAGS and friends rather than assuming that w32api lives nearby. utils/ChangeLog: 2012-11-12 Christopher Faylor * aclocal.m4: Regenerate. * configure: Ditto. * autogen.sh: New script. * configure.in: Revamp for new configury. * Makefile.in: Revamp for new configury. Rename ALL_* to just *. Always use "VERBOSE" setting. (MINGW_CXX): Don't include CFLAGS in definition. (all): Define target first, before everything else so that it is the default. (ps.exe): Don't add useless -lcygwin. (ldh.exe): For consistency, add to existing MINGW_LDFLAGS rather than redefining them. (cygcheck.exe): Always include -lz for MINGW_LDFLAGS. Don't try to figure out where to find it. (dumper.exe): Simplify check. Assume libraries are installed rather than trying to retrieve from source tree. (install): Just use /bin/mkdir to create directories. (Makefile): Regenerate when standard dependencies change. * dump_setup.cc: Always include zlib.h. Remove accommodations for it possibly not existing. * parse_pe.cc: Add define which allows building with installed binutils package. * dumper.cc: Ditto. --- winsup/cygserver/Makefile.in | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'winsup/cygserver/Makefile.in') diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in index b4dcbfacb..3522f9d6e 100644 --- a/winsup/cygserver/Makefile.in +++ b/winsup/cygserver/Makefile.in @@ -7,10 +7,22 @@ # Cygwin license. Please consult the file "CYGWIN_LICENSE" for # details. -SHELL:=@SHELL@ - srcdir:=@srcdir@ -VPATH:=@srcdir@ +target_builddir:=@target_builddir@ +winsup_srcdir:=@winsup_srcdir@ +configure_args=@configure_args@ + +export CC:=@CC@ +export CXX:=@CXX@ + +include ${srcdir}/../Makefile.common + +cygwin_build:=${target_builddir}/winsup/cygwin + +# environment variables used by ccwrap +export CCWRAP_HEADERS:=$(dir ${srcdir})/cygwin ${cygwin_build} +export CCWRAP_SYSTEM_HEADERS:=@cygwin_headers@ @newlib_headers@ +export CCWRAP_DIRAFTER_HEADERS:=@windows_headers@ DESTDIR= prefix:=${DESTDIR}@prefix@ @@ -24,20 +36,12 @@ INSTALL:=@INSTALL@ INSTALL_PROGRAM:=@INSTALL_PROGRAM@ INSTALL_DATA:=@INSTALL_DATA@ -CC:=@CC@ -CC_FOR_TARGET:=$(CC) -CXX:=@CXX@ -CXX_FOR_TARGET:=$(CXX) AR:=@AR@ -include $(srcdir)/../Makefile.common - CFLAGS:=@CFLAGS@ override CXXFLAGS=@CXXFLAGS@ override CXXFLAGS+=-MMD -DHAVE_DECL_GETOPT=0 -D__OUTSIDE_CYGWIN__ -DSYSCONFDIR="\"$(sysconfdir)\"" -.SUFFIXES: .c .cc .a .o .d - OBJS:= cygserver.o client.o process.o msg.o sem.o shm.o threaded_queue.o \ transport.o transport_pipes.o \ bsd_helper.o bsd_log.o bsd_mutex.o \ @@ -78,9 +82,10 @@ $(cygwin_build)/%.o: $(cygwin_source)/%.c @$(MAKE) -C $(@D) $(@F) Makefile: Makefile.in configure + ./config.status lib%.o: %.cc - ${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -c -I$(updir)/cygwin -I$(bupdir)/cygwin -o $(@D)/${basename $(@F)}$o $< + ${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE.cc)} -c -o $(@D)/${basename $(@F)}.o $< libcygserver.a: $(LIBOBJS) $(AR) crus $@ $? -- cgit v1.2.3