diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-15 12:34:28 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-15 11:10:14 +0200 |
| commit | 9afd4be688429d7bb344087cb3eda876f18e19f9 (patch) | |
| tree | 3f3fd51295686364dbfba5f99c94f2daa1f78548 /lib | |
| parent | 8e31d97c8b62d34aff5d52bfe46dbcc5805dae03 (diff) | |
| download | samba-9afd4be688429d7bb344087cb3eda876f18e19f9.tar.gz samba-9afd4be688429d7bb344087cb3eda876f18e19f9.tar.bz2 samba-9afd4be688429d7bb344087cb3eda876f18e19f9.zip | |
s3-build: Do not write loadparm generated files into the build tree
We need to keep these files away from where waf might see them.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jun 15 11:10:14 CEST 2012 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/loadparm.c | 6 | ||||
| -rw-r--r-- | lib/param/param.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 520fc94665..5749c34696 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 7842a843f6..d821fa3d35 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 *); |