diff options
| author | Tim Potter <tpot@samba.org> | 2003-05-27 02:35:53 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-05-27 02:35:53 +0000 |
| commit | 4e8052640e4029938111d5a1af16865c67e21bf9 (patch) | |
| tree | 8b00e6e2d2c8bcb4062eede5773b2abaf12a4558 /source3/smbd | |
| parent | ab222b3700313348b2a1b673be82a58cb03c7c79 (diff) | |
| download | samba-4e8052640e4029938111d5a1af16865c67e21bf9.tar.gz samba-4e8052640e4029938111d5a1af16865c67e21bf9.tar.bz2 samba-4e8052640e4029938111d5a1af16865c67e21bf9.zip | |
More fixes for builddir != srcdir.
- Use absolute directories for $builddir and $srcdir in the Makefile
- Don't try and combine source files in $builddir and $srcdir to build
proto.h. It's just too hard to get it right across all targets we
wish to compile on. Use a hand created prototype for the single
function in smbd/build_options.c that we need. This allows us to ditch
all the extra sed work that was causing problems: \t not portable - hah!
- Fix bogus delheaders target to remove the correct files
This appears to work quite nicely now. Let's see how it goes on the
buildfarm machines.
(This used to be commit 456184463d35c18840c39cb3483b7136247ea764)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/server.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index edc7b57ba3..07723cc20e 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -634,6 +634,12 @@ static BOOL init_structs(void ) main program. ****************************************************************************/ +/* Declare prototype for build_options() to avoid having to run it through + mkproto.h. Mixing $(builddir) and $(srcdir) source files in the current + prototype generation system is too complicated. */ + +void build_options(BOOL screen); + int main(int argc,const char *argv[]) { /* shall I run as a daemon */ |