diff options
| author | Tim Potter <tpot@samba.org> | 2002-12-05 22:56:25 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-12-05 22:56:25 +0000 |
| commit | 8ae8dd66e1509147462e80c3b50f0d04cfd18cfb (patch) | |
| tree | 06549c891dd9c6aa7e3830271a2066658974bc38 | |
| parent | 76d32efaad8e72c3647fb1911f8afd268f9d3806 (diff) | |
| download | samba-8ae8dd66e1509147462e80c3b50f0d04cfd18cfb.tar.gz samba-8ae8dd66e1509147462e80c3b50f0d04cfd18cfb.tar.bz2 samba-8ae8dd66e1509147462e80c3b50f0d04cfd18cfb.zip | |
Merge from appliance, Revision 1.223.2.41:
>Add -a flag to setup.py when making python_clean. This will delete the
>python compiled binaries and .so files rather than only the temporary
>compile directory.
>
>This fixes a PSA build bug.
Merge from HEAD, Revision 1.587:
>Link less with smbmnt and smbumount. Also change from a pstrcpy() to a
>strncpy() to make it clear that we must operate on a PATH_MAX sized buffer.
>
>Andrew Bartlett
Plus some bits from the AC_SUBST target cleanup that got missed last time
I ran dirdiff.
(This used to be commit 9b94c82958c136e344032651e1582ee63137114a)
| -rw-r--r-- | source3/Makefile.in | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4edbb84f2c..56c44a39f2 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -107,7 +107,7 @@ SBIN_PROGS = bin/smbd@EXEEXT@ bin/nmbd@EXEEXT@ bin/swat@EXEEXT@ \ bin/wrepld@EXEEXT@ @EXTRA_SBIN_PROGS@ BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \ - bin/testparm@EXEEXT@ bin/testprns@EXEEXT@ bin/smbstatus@EXEEXT@ + bin/testparm@EXEEXT@ bin/testprns@EXEEXT@ bin/smbstatus@EXEEXT@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \ bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \ @@ -424,8 +424,7 @@ MOUNT_OBJ = client/smbmount.o \ MNT_OBJ = client/smbmnt.o -UMOUNT_OBJ = client/smbumount.o \ - $(PARAM_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) +UMOUNT_OBJ = client/smbumount.o NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(UBIQX_OBJ) \ $(LIBSMB_OBJ) $(LIB_OBJ) @@ -687,11 +686,11 @@ bin/smbmount@EXEEXT@: $(MOUNT_OBJ) bin/.dummy bin/smbmnt@EXEEXT@: $(MNT_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(MNT_OBJ) $(LDFLAGS) bin/smbumount@EXEEXT@: $(UMOUNT_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(LDFLAGS) bin/testparm@EXEEXT@: $(TESTPARM_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @@ -972,8 +971,8 @@ python_clean: # revert to the previously installed version revert: - @$(SHELL) $(srcdir)/script/revert.sh $(SBINDIR) $(SPROGS) - @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(PROGS) $(SCRIPTS) + @$(SHELL) $(srcdir)/script/revert.sh $(SBINDIR) $(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS) installman: @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) $(man_langs) "@ROFF@" @@ -996,8 +995,8 @@ uninstallman: @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) $(man_langs) uninstallbin: - @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(SPROGS) - @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(PROGS) + @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(SBIN_PROGS) + @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(BIN_PROGS) uninstallmodules: @$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(PDBLIBDIR) $(DESTDIR)$(VFS_MODULES) |