diff options
Diffstat (limited to 'source3')
| -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 |
4 files changed, 24 insertions, 18 deletions
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 |