diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 18:40:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-21 18:40:06 +0100 |
| commit | 715cc00bc01e151c10e3d723cd29e126a6464637 (patch) | |
| tree | 538017d459e7531a726e34767c0abcbe5e683faa /source3/Makefile.in | |
| parent | 293acaf92e7234665e15c3fb7fd600427ffcd5ce (diff) | |
| parent | a868d2f3d5281dea923718486e4e42b20cf8fe74 (diff) | |
| download | samba-715cc00bc01e151c10e3d723cd29e126a6464637.tar.gz samba-715cc00bc01e151c10e3d723cd29e126a6464637.tar.bz2 samba-715cc00bc01e151c10e3d723cd29e126a6464637.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 08ba0ad32a..1924ade8fb 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -856,9 +856,10 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \ $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \ $(DISPLAY_SEC_OBJ) -LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \ +LIBSMBCONF_OBJ = ../lib/smbconf/smbconf.o \ + ../lib/smbconf/smbconf_util.o \ + ../lib/smbconf/smbconf_txt.o \ lib/smbconf/smbconf_reg.o \ - lib/smbconf/smbconf_txt.o \ lib/smbconf/smbconf_init.o SMBCONFTORT_OBJ0 = lib/smbconf/testsuite.o |