summaryrefslogtreecommitdiff
path: root/source3/Makefile.in
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-07-08 09:19:43 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-07-08 12:35:56 +0200
commitcda86869400285afe17db87a9a666fbcc5b918a8 (patch)
treed5e36a1f276729a827c2303bdfad56b8aacff55f /source3/Makefile.in
parentcf406f7e7d58b9c993ba1ddc6471fa85e445ba88 (diff)
downloadsamba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.gz
samba-cda86869400285afe17db87a9a666fbcc5b918a8.tar.bz2
samba-cda86869400285afe17db87a9a666fbcc5b918a8.zip
lib/param: Merge struct loadparm_service into common
This is handled by a common header and a .c file that is included into both loadparm.c files. In the process, _lp functions were renamed to lp__ to allow the common function definition declarations to be used by source3 and source4 (which have different macro definitions). The only parameter to change type is 'strict_locking' which was a bool, and is now an int, to accommodate the 'Auto' value from source3. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Fri Jul 8 12:35:56 CEST 2011 on sn-devel-104
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r--source3/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index e348509655..146c9cb2f2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1643,7 +1643,7 @@ idl_full::
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES)
mkparam:
- $(PERL) ../script/mkparamdefs.pl $(srcdir)/param/loadparm.c --file param/param_local.h --generate-scope=LOCAL
+ $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL
$(PERL) ../script/mkparamdefs.pl $(srcdir)/param/loadparm.c --file param/param_global.h --generate-scope=GLOBAL
#####################################################################