diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-11-04 12:02:48 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-11-04 12:02:48 +0000 |
| commit | f35e15bd757970995bea80a1cf069bb34a62f99f (patch) | |
| tree | b9d4da312843556deeff5e8961203e98271883d3 | |
| parent | 99cd4b52a7ca9368bc24276d2e62a89a05bd3a77 (diff) | |
| download | samba-f35e15bd757970995bea80a1cf069bb34a62f99f.tar.gz samba-f35e15bd757970995bea80a1cf069bb34a62f99f.tar.bz2 samba-f35e15bd757970995bea80a1cf069bb34a62f99f.zip | |
Try to fix popt dependencies - we were linking to popt before we built with it.
Andrew Bartlett
(This used to be commit dd9c6214d1976d87679735ea392b1a76463206a4)
| -rw-r--r-- | source3/Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index a2de777374..3e681dbdb9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -616,12 +616,12 @@ bin/.dummy: dir=bin $(MAKEDIR); fi @: >> $@ || : > $@ # what a fancy emoticon! -bin/smbd: $(SMBD_OBJ) bin/.dummy +bin/smbd: $(SMBD_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \ $(AUTHLIBS) $(LIBS) @BUILD_POPT@ -bin/nmbd: $(NMBD_OBJ) bin/.dummy +bin/nmbd: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(LIBS) @BUILD_POPT@ @@ -666,7 +666,7 @@ bin/smbumount: $(UMOUNT_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(LDFLAGS) $(LIBS) -bin/testparm: $(TESTPARM_OBJ) bin/.dummy +bin/testparm: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(LIBS) @BUILD_POPT@ @@ -690,11 +690,11 @@ bin/smbpasswd: $(SMBPASSWD_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) -bin/pdbedit: $(PDBEDIT_OBJ) bin/.dummy +bin/pdbedit: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @BUILD_POPT@ -bin/samtest: $(SAMTEST_OBJ) bin/.dummy +bin/samtest: $(SAMTEST_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @BUILD_POPT@ @@ -734,7 +734,7 @@ bin/nsstest: $(NSSTEST_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(LIBS) -bin/vfstest: $(VFSTEST_OBJ) bin/.dummy +bin/vfstest: $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINTLIBS) $(AUTHLIBS) $(LIBS) @BUILD_POPT@ |