diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 15:37:57 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 15:37:57 +0200 |
commit | 6c83039eaba70fe983325f15359f1bafc40c4ec6 (patch) | |
tree | 84f0766be1c9fc1f6f284cb38ad693fb59a20eae /source3/Makefile.in | |
parent | 18faf30d1684ed9d46ffa42b6d6f9768c2b0c54f (diff) | |
parent | 339925f98d5b42f7ea09842f3920fb9281e6caa2 (diff) | |
download | samba-6c83039eaba70fe983325f15359f1bafc40c4ec6.tar.gz samba-6c83039eaba70fe983325f15359f1bafc40c4ec6.tar.bz2 samba-6c83039eaba70fe983325f15359f1bafc40c4ec6.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into xmaster
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 1b460f414e..c880f79eb5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -360,7 +360,7 @@ READLINE_OBJ = lib/readline.o # Be sure to include them into your application POPT_LIB_OBJ = lib/popt_common.o -PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o param/params.o param/util.o lib/sharesec.o lib/ldap_debug_handler.o +PARAM_WITHOUT_REG_OBJ = dynconfig.o param/loadparm.o ../lib/util/params.o param/util.o lib/sharesec.o lib/ldap_debug_handler.o PARAM_REG_ADD_OBJ = $(REG_SMBCONF_OBJ) $(LIBSMBCONF_OBJ) $(PRIVILEGES_BASIC_OBJ) PARAM_OBJ = $(PARAM_WITHOUT_REG_OBJ) $(PARAM_REG_ADD_OBJ) |