diff options
author | Herb Lewis <herb@samba.org> | 2001-12-05 19:45:30 +0000 |
---|---|---|
committer | Herb Lewis <herb@samba.org> | 2001-12-05 19:45:30 +0000 |
commit | 646b5ae752f7cd00e057d0d7cc6001161125fd3f (patch) | |
tree | ea92ee1b1cc962c4fda70d799bbf090a7e982032 /source/Makefile.in | |
parent | 291985123515f99bb3fd86605d5b8a08301070a2 (diff) | |
download | samba-646b5ae752f7cd00e057d0d7cc6001161125fd3f.tar.gz samba-646b5ae752f7cd00e057d0d7cc6001161125fd3f.tar.xz samba-646b5ae752f7cd00e057d0d7cc6001161125fd3f.zip |
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.
Diffstat (limited to 'source/Makefile.in')
-rw-r--r-- | source/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 2a7294b0f5f..500c6d5415e 100644 --- a/source/Makefile.in +++ b/source/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 |