diff options
| author | Tim Potter <tpot@samba.org> | 2003-04-14 03:30:20 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-04-14 03:30:20 +0000 |
| commit | 63cbbe26923b8f6bbed11428a3a218a88d17ffe7 (patch) | |
| tree | 52dd470aabad3507df6bc9f68f5b90a6c2b86c12 /source3/Makefile.in | |
| parent | be67b58247680af0d672675f76e7b2af9dc94bcd (diff) | |
| download | samba-63cbbe26923b8f6bbed11428a3a218a88d17ffe7.tar.gz samba-63cbbe26923b8f6bbed11428a3a218a88d17ffe7.tar.bz2 samba-63cbbe26923b8f6bbed11428a3a218a88d17ffe7.zip | |
Merge Jelmer's popt updates from HEAD.
(This used to be commit 98e84b3e83d2a365c818ea64f9418edb29d690f2)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index ac27232590..ce37ccff91 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -397,7 +397,7 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(LOCKING_OBJ) $(PARAM_OBJ) \ SMBTREE_OBJ = utils/smbtree.o $(LOCKING_OBJ) $(PARAM_OBJ) \ $(UBIQX_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) $(LIBSMB_OBJ) \ - $(KRBCLIENT_OBJ) + $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) TESTPARM_OBJ = utils/testparm.o \ $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) $(POPT_LIB_OBJ) @@ -779,9 +779,9 @@ bin/smbcontrol@EXEEXT@: $(SMBCONTROL_OBJ) bin/.dummy @echo Linking $@ @$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ $(SMBCONTROL_OBJ) $(LDFLAGS) $(LIBS) -bin/smbtree@EXEEXT@: $(SMBTREE_OBJ) bin/.dummy +bin/smbtree@EXEEXT@: $(SMBTREE_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(LIBS) @BUILD_POPT@ bin/smbpasswd@EXEEXT@: $(SMBPASSWD_OBJ) bin/.dummy @echo Linking $@ |