From 457e6ac0430abc9961747366e0ec90d755362d1d Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 10 Feb 2006 02:46:45 +0000 Subject: r13425: Revert all the "clever" compiler options checks. They broke the build on Solaris, AIX and S390. The fundamental problem is that macros like AX_CFLAGS_IRIX_OPTION can spuriously succeed. (This used to be commit 30122f61c35b1af977efd6e4727204c2e2e1c7a3) --- source3/Makefile.in | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 3dace60331..d8f7dcf519 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -17,13 +17,6 @@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ EXEEXT=@EXEEXT@ LDFLAGS=@LDFLAGS@ - -PGO_GENERATE_CFLAGS=@PGO_GENERATE_CFLAGS@ -PGO_USE_CFLAGS=@PGO_USE_CFLAGS@ -PGO_EXPERIMENT_SCRIPT=@PGO_EXPERIMENT_SCRIPT@ -PGO_LIBS=@PGO_LIBS@ -PGO_TARGET=bin/smbd - AR=@AR@ LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ @@ -800,24 +793,6 @@ cac: SHOWFLAGS bin/libmsrpc.@SHLIBEXT@ bin/libmsrpc.a everything: all libsmbclient debug2html smbfilter talloctort modules torture \ $(EVERYTHING_PROGS) -# Top level target to build $(PGO_TARGET) with profiling data. Use sub-makes to -# make sure that parallel make does not perturb this sequence. -@ifPGO@pgo: -@ifPGO@ $(MAKE) pgo-generate -@ifPGO@ $(MAKE) pgo-workload -@ifPGO@ $(MAKE) clean -@ifPGO@ $(MAKE) headers -@ifPGO@ $(MAKE) pgo-use - -@ifPGO@pgo-generate: -@ifPGO@ $(MAKE) CFLAGS="$(CFLAGS) $(PGO_GENERATE_CFLAGS)" "LIBS=$(LIBS) $(PGO_LIBS)" $(PGO_TARGET) - -@ifPGO@pgo-workload: -@ifPGO@ $(SHELL) $(PGO_EXPERIMENT_SCRIPT) - -@ifPGO@pgo-use: -@ifPGO@ $(MAKE) CFLAGS="$(CFLAGS) $(PGO_USE_CFLAGS)" $(PGO_TARGET) - .SUFFIXES: .SUFFIXES: .c .o .@PICSUFFIX@ .lo @@ -828,8 +803,6 @@ SHOWFLAGS: @echo " LDFLAGS = $(LDFLAGS)" @echo " PIE_CFLAGS = @PIE_CFLAGS@" @echo " PIE_LDFLAGS = @PIE_LDFLAGS@" -@ifPGO@ @echo " PGO_GENERATE_CFLAGS = $(PGO_GENERATE_CFLAGS)" -@ifPGO@ @echo " PGO_USE_CFLAGS = $(PGO_USE_CFLAGS)" MAKEDIR = || exec false; \ if test -d "$$dir"; then :; else \ @@ -1642,7 +1615,6 @@ ctags: realclean: clean delheaders -rm -f config.log bin/.dummy script/findsmb -@ifPGO@ -rm -f *.gcno *.gcda *.da */*.gcno */*.gcda */*.da distclean: realclean -rm -f include/stamp-h -- cgit