diff options
| -rw-r--r-- | .gitignore | 12 | ||||
| -rw-r--r-- | lib/param/loadparm.c | 6 | ||||
| -rw-r--r-- | lib/param/param.h | 2 | ||||
| -rw-r--r-- | source3/Makefile.in | 26 | ||||
| -rw-r--r-- | source3/autoconf/lib/param/README | 3 | ||||
| -rw-r--r-- | source3/autoconf/source3/param/README | 3 | ||||
| -rwxr-xr-x | source3/autogen.sh | 10 | ||||
| -rwxr-xr-x | wscript_build | 2 |
8 files changed, 35 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore index b18a6d10131..7f2c5909f63 100644 --- a/.gitignore +++ b/.gitignore @@ -90,13 +90,13 @@ source3/script/installbin.sh source3/script/uninstallbin.sh source3/smbadduser source3/smbd/build_options.c -source3/param/param_global.h -source3/param/param_local.h +source3/autoconf/source3/param/param_global.h +source3/autoconf/source3/param/param_local.h source3/setup -lib/param/param_global.h -lib/param/param_local.h -lib/param/param_proto.h -lib/param/s3_param.h +source3/autoconf/lib/param/param_global.h +source3/autoconf/lib/param/param_local.h +source3/autoconf/lib/param/param_proto.h +source3/autoconf/lib/param/s3_param.h pidl/blib pidl/cover_db pidl/Makefile diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 520fc94665f..5749c346965 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -62,7 +62,7 @@ #include "lib/param/param.h" #include "lib/param/loadparm.h" #include "auth/gensec/gensec.h" -#include "s3_param.h" +#include "lib/param/s3_param.h" #include "lib/util/bitmap.h" #include "libcli/smb/smb_constants.h" #include "source4/dns_server/dns_update.h" @@ -88,7 +88,7 @@ static bool defaults_saved = false; int domain_logons; \ int bPreferredMaster; -#include "param_global.h" +#include "lib/param/param_global.h" #define NUMPARAMETERS (sizeof(parm_table) / sizeof(struct parm_struct)) @@ -105,7 +105,7 @@ static bool handle_debuglevel(struct loadparm_context *lp_ctx, int unused, static bool handle_logfile(struct loadparm_context *lp_ctx, int unused, const char *pszParmValue, char **ptr); -#include "param_enums.c" +#include "lib/param/param_enums.c" #define GLOBAL_VAR(name) offsetof(struct loadparm_global, name) #define LOCAL_VAR(name) offsetof(struct loadparm_service, name) diff --git a/lib/param/param.h b/lib/param/param.h index 7842a843f6c..d821fa3d35f 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -48,7 +48,7 @@ struct smbcli_session_options; struct gensec_settings; #ifdef CONFIG_H_IS_FROM_SAMBA -#include "param/param_proto.h" +#include "lib/param/param_proto.h" #endif const char **lpcfg_interfaces(struct loadparm_context *); diff --git a/source3/Makefile.in b/source3/Makefile.in index 9271baa777a..43dfb949cdf 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -171,7 +171,7 @@ FLAGS = -I. \ -I$(srcdir)/lib \ -I.. \ -Iautoconf \ - -Iautoconf/librpc \ + -Iautoconf/source3 \ -I./../lib/ldb/include \ -D_SAMBA_BUILD_=3 @@ -1679,18 +1679,18 @@ idl_full:: @PIDL_OUTPUTDIR="autoconf/librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \ srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES) -mkparam: ../lib/param/param_local.h ../lib/param/param_global.h param/param_global.h ../lib/param/param_proto.h ../lib/param/s3_param.h - -../lib/param/param_local.h: - $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL -../lib/param/param_global.h: - $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file ../lib/param/param_global.h --generate-scope=GLOBAL -param/param_global.h: - $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file param/param_global.h --generate-scope=GLOBAL -../lib/param/param_proto.h: - $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public ../lib/param/param_proto.h --private ../lib/param/param_proto.h -../lib/param/s3_param.h: - $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file ../lib/param/s3_param.h +mkparam: autoconf/lib/param/param_local.h autoconf/lib/param/param_global.h autoconf/source3/param/param_global.h autoconf/lib/param/param_proto.h autoconf/lib/param/s3_param.h + +autoconf/lib/param/param_local.h: + $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL +autoconf/lib/param/param_global.h: + $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL +autoconf/source3/param/param_global.h: + $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/param/loadparm.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL +autoconf/lib/param/param_proto.h: + $(PERL) ../source4/script/mkproto.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --public autoconf/lib/param/param_proto.h --private autoconf/lib/param/param_proto.h +autoconf/lib/param/s3_param.h: + $(PERL) ../script/mks3param.pl $(srcdir)/../lib/param/param_functions.c $(srcdir)/../lib/param/loadparm.c --file autoconf/lib/param/s3_param.h ##################################################################### diff --git a/source3/autoconf/lib/param/README b/source3/autoconf/lib/param/README new file mode 100644 index 00000000000..2d7cf01e0c3 --- /dev/null +++ b/source3/autoconf/lib/param/README @@ -0,0 +1,3 @@ +This file denoates the output location of perl-generated files that we need for loadparm. + +To ensure no conflict between waf and autoconf, we generate the files here.
\ No newline at end of file diff --git a/source3/autoconf/source3/param/README b/source3/autoconf/source3/param/README new file mode 100644 index 00000000000..2d7cf01e0c3 --- /dev/null +++ b/source3/autoconf/source3/param/README @@ -0,0 +1,3 @@ +This file denoates the output location of perl-generated files that we need for loadparm. + +To ensure no conflict between waf and autoconf, we generate the files here.
\ No newline at end of file diff --git a/source3/autogen.sh b/source3/autogen.sh index 15689e07e13..bd0d99d7e87 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -95,11 +95,11 @@ else echo "some autconf tests might not work properly" fi -perl ../script/mkparamdefs.pl ../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL -perl ../script/mkparamdefs.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file ../lib/param/param_global.h --generate-scope=GLOBAL -perl ../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c --file param/param_global.h --generate-scope=GLOBAL -perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public ../lib/param/param_proto.h --private ../lib/param/param_proto.h -perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file ../lib/param/s3_param.h +perl ../script/mkparamdefs.pl ../lib/param/param_functions.c --file autoconf/lib/param/param_local.h --generate-scope=LOCAL +perl ../script/mkparamdefs.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/param_global.h --generate-scope=GLOBAL +perl ../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c --file autoconf/source3/param/param_global.h --generate-scope=GLOBAL +perl ../source4/script/mkproto.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --public autoconf/lib/param/param_proto.h --private ../lib/param/param_proto.h +perl ../script/mks3param.pl ../lib/param/loadparm.c ../lib/param/param_functions.c --file autoconf/lib/param/s3_param.h echo "Now run ./configure (or ./configure.developer) and then make." exit 0 diff --git a/wscript_build b/wscript_build index 508de7056aa..d4959f32f8b 100755 --- a/wscript_build +++ b/wscript_build @@ -20,7 +20,7 @@ bld.env.build_public_headers = 'include/public' # these are includes which appear in public headers, but with #ifdef conditional # compilation, so they are safe -bld.env.public_headers_skip = ['param/param_proto.h'] +bld.env.public_headers_skip = ['lib/param/param_proto.h'] samba_version.load_version(bld.env, is_install=bld.is_install) bld.SAMBA_MKVERSION('version.h') |