diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
| commit | 9ef623beda5d6a7507ff6c871117c8f88e547441 (patch) | |
| tree | dff1dc9cb6de1389a9aa18af51349e1fbef90b83 /source3/Makefile.in | |
| parent | a347ab83f447d7921d5d427e56f6965342b25834 (diff) | |
| parent | c8bff39df639c70afc94b1795c94629ee8b7b482 (diff) | |
| download | samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.gz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.bz2 samba-9ef623beda5d6a7507ff6c871117c8f88e547441.zip | |
Merge branch 'singlepopt' into single
Conflicts:
source4/Makefile
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 31387c315c..cf7f131140 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1056,8 +1056,8 @@ LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o WINBIND_KRB5_LOCATOR_OBJ1 = nsswitch/winbind_krb5_locator.o WINBIND_KRB5_LOCATOR_OBJ = $(WINBIND_KRB5_LOCATOR_OBJ1) $(WBCOMMON_OBJ) $(LIBREPLACE_OBJ) -POPT_OBJ=popt/findme.o popt/popt.o popt/poptconfig.o \ - popt/popthelp.o popt/poptparse.o +POPT_OBJ=../popt/findme.o ../popt/popt.o ../popt/poptconfig.o \ + ../popt/popthelp.o ../popt/poptparse.o INIPARSER_OBJ = iniparser_build/iniparser.o iniparser_build/dictionary.o \ iniparser_build/strlib.o |