From f3e6f2d9536a7312729827d47e53f023bafb4ef5 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Wed, 5 Dec 2001 19:45:30 +0000 Subject: dont add -I./popt to CFLAGS it really belongs in FLAGS1 with other include paths. This make it hard to use a script that overrides CFLAGS options. (This used to be commit 646b5ae752f7cd00e057d0d7cc6001161125fd3f) --- source3/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 2a7294b0f5..500c6d5415 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -69,9 +69,10 @@ LOCKDIR = @lockdir@ # man pages language(s) man_langs = "@manlangs@" -FLAGS1 = $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -I. -I$(srcdir) +FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper $(CPPFLAGS) -I. -I$(srcdir) FLAGS2 = FLAGS3 = +FLAGS4 = FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) FLAGS = $(ISA) $(FLAGS5) FLAGS32 = $(ISA32) $(FLAGS5) @@ -790,8 +791,8 @@ winbindd_proto: $(WINBINDD_OBJ1) delheaders: - @/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h - @/bin/rm -f include/proto.h include/build_env.h + @/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h $(srcdir)/.headers.stamp + @/bin/rm -f include/proto.h include/build_env.h .headers.stamp # we want our generated headers to be rebuilt if they don't exist, but not rebuilt every time .headers.stamp: include/proto.h include/build_env.h -- cgit