X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source3%2FMakefile.in;h=0a72cf579aa7ab484d8cf517ae271d30ffa9d382;hb=07f14aa3a7431ee1bd2994db84e32afddcaaf8dd;hp=5554e69c8f01b4631418ecd3e14f48b12e9c0789;hpb=2abc34cb4a45d83bfee49a0fb881ba9cbe271249;p=samba.git diff --git a/source3/Makefile.in b/source3/Makefile.in index 5554e69c8f0..0a72cf579aa 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -16,6 +16,42 @@ sysconfdir=@sysconfdir@ localstatedir=@localstatedir@ datarootdir=@datarootdir@ +# the following vars come from ../dynconfig/config.m4 +BINDIR=@BINDIR@ +SBINDIR=@SBINDIR@ +LIBDIR=@LIBDIR@ +#LIBEXECDIR=@LIBEXECDIR@ +MANDIR=@MANDIR@ +DATADIR=@DATADIR@ +LOCALEDIR=@LOCALEDIR@ +#SCRIPTSBINDIR=@SCRIPTSBINDIR@ +#PYTHONDIR=@PYTHONDIR@ +#PYTHONARCHDIR=@PYTHONARCHDIR@ +MODULESDIR=@MODULESDIR@ +INCLUDEDIR=@INCLUDEDIR@ +SETUPDIR=@SETUPDIR@ +#PKGCONFIGDIR=@PKGCONFIGDIR@ +SWATDIR=@SWATDIR@ +CODEPAGEDIR=@CODEPAGEDIR@ +PAMMODULESDIR=@PAMMODULESDIR@ +CONFIGDIR=@CONFIGDIR@ +PRIVATE_DIR=@PRIVATE_DIR@ +LOCKDIR=@LOCKDIR@ +PIDDIR=@PIDDIR@ +STATEDIR=@STATEDIR@ +CACHEDIR=@CACHEDIR@ +LOGFILEBASE=@LOGFILEBASE@ +SOCKET_DIR=@SOCKET_DIR@ +PRIVILEGED_SOCKET_DIR=@PRIVILEGED_SOCKET_DIR@ +#WINBINDD_SOCKET_DIR=@WINBINDD_SOCKET_DIR@ +#WINBINDD_PRIVILEGED_SOCKET_DIR=@WINBINDD_PRIVILEGED_SOCKET_DIR@ +NMBDSOCKETDIR=@NMBDSOCKETDIR@ +#NTP_SIGND_SOCKET_DIR=@NTP_SIGND_SOCKET_DIR@ +NCALRPCDIR=@NCALRPCDIR@ +CONFIGFILE=@CONFIGFILE@ +LMHOSTSFILE=@LMHOSTSFILE@ +SMB_PASSWD_FILE=@SMB_PASSWD_FILE@ + selftest_prefix=@selftest_prefix@ selftest_shrdir=@selftest_shrdir@ smbtorture4_path=@smbtorture4_path@ @@ -117,14 +153,6 @@ DESTDIR=/ # See the autoconf manual "Installation Directory Variables" for a # discussion of the subtle use of these variables. -BASEDIR= @prefix@ -BINDIR = @bindir@ -# sbindir is mapped to bindir when compiling SAMBA in 2.0.x compatibility mode. -SBINDIR = @sbindir@ -LIBDIR = @libdir@ -MODULESDIR = @modulesdir@ -INCLUDEDIR=@includedir@ -PAMMODULESDIR = @pammodulesdir@ VFSLIBDIR = $(MODULESDIR)/vfs PERFCOUNTLIBDIR = $(MODULESDIR)/perfcount PDBLIBDIR = $(MODULESDIR)/pdb @@ -135,52 +163,12 @@ CHARSETLIBDIR = $(MODULESDIR)/charset AUTHLIBDIR = $(MODULESDIR)/auth CONFIGLIBDIR = $(MODULESDIR)/config GPEXTLIBDIR = $(MODULESDIR)/gpext -CONFIGDIR = @configdir@ VARDIR = @localstatedir@ -MANDIR = @mandir@ -DATADIR = @datadir@ -SETUPDIR = @datadir@/setup # The permissions to give the executables and other data INSTALLPERMS_BIN = 0755 INSTALLPERMS_DATA = 0644 -# set these to where to find various files -# These can be overridden by command line switches (see smbd(8)) -# or in smb.conf (see smb.conf(5)) -LOGFILEBASE = @logfilebase@ -CONFIGFILE = $(CONFIGDIR)/smb.conf -LMHOSTSFILE = $(CONFIGDIR)/lmhosts -NCALRPCDIR = @ncalrpcdir@ - -# This is where smbpasswd et al go -PRIVATEDIR = @privatedir@ - -SMB_PASSWD_FILE = $(PRIVATEDIR)/smbpasswd -PRIVATE_DIR = $(PRIVATEDIR) - -# This is where SWAT images and help files go -SWATDIR = @swatdir@ - -# This is where locale(mo) files go -LOCALEDIR= @localedir@ - -# the directory where lock files go -LOCKDIR = @lockdir@ - -# FHS directories; equal to LOCKDIR if not using --with-fhs, but also settable -CACHEDIR = @cachedir@ -STATEDIR = @statedir@ - -# Where to look for (and install) codepage databases. -CODEPAGEDIR = @codepagedir@ - -# the directory where pid files go -PIDDIR = @piddir@ - -# the directory where nmbd listens on the unexpected socket -NMBDSOCKETDIR = @nmbdsocketdir@ - FLAGS = -I. \ -I$(srcdir) \ @FLAGS1@ \ @@ -456,7 +444,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \ lib/username.o \ ../libds/common/flag_mapping.o \ lib/access.o lib/smbrun.o \ - lib/bitmap.o ../lib/util/dprintf.o $(UTIL_REG_OBJ) \ + ../lib/util/bitmap.o ../lib/util/dprintf.o $(UTIL_REG_OBJ) \ lib/wins_srv.o lib/string_init.o \ lib/util_str.o ../lib/util/util_str_common.o \ ../lib/util/util_str.o \ @@ -606,6 +594,11 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/smb2cli_tcon.o \ libsmb/smb2cli_create.o \ ../libcli/smb/smb2_create_blob.o \ + libsmb/smb2cli_close.o \ + libsmb/smb2cli_flush.o \ + libsmb/smb2cli_read.o \ + libsmb/smb2cli_write.o \ + libsmb/smb2cli_query_directory.o \ libsmb/cli_np_tstream.o \ libsmb/smbsock_connect.o \ $(LIBSAMBA_OBJ) \ @@ -1247,7 +1240,8 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta torture/test_notify_online.o \ torture/test_addrchange.o \ torture/test_case_insensitive.o \ - torture/test_posix_append.o + torture/test_posix_append.o \ + torture/test_smb2.o SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \ $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -1637,7 +1631,7 @@ idl_full:: srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh --full $(IDL_FILES) mkparam: - $(PERL) ../script/mkparamdefs.pl $(srcdir)/param/loadparm.c --file param/param_local.h --generate-scope=LOCAL + $(PERL) ../script/mkparamdefs.pl $(srcdir)/../lib/param/param_functions.c --file ../lib/param/param_local.h --generate-scope=LOCAL $(PERL) ../script/mkparamdefs.pl $(srcdir)/param/loadparm.c --file param/param_global.h --generate-scope=GLOBAL ##################################################################### @@ -3250,7 +3244,7 @@ install-everything:: install installmodules installdirs:: @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) \ $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) \ - $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \ + $(VARDIR) $(PRIVATE_DIR) $(PIDDIR) $(LOCKDIR) $(STATEDIR) \ $(NMBDSOCKETDIR) \ $(CACHEDIR) $(MANDIR) $(CODEPAGEDIR) $(MODULESDIR) $(LOCALEDIR) @@ -3317,23 +3311,45 @@ installmo:: all installdirs showlayout:: @echo "Samba will be installed into:" - @echo " prefix: $(prefix)" - @echo " bindir: $(BINDIR)" - @echo " sbindir: $(SBINDIR)" - @echo " libdir: $(LIBDIR)" - @echo " modulesdir: $(MODULESDIR)" - @echo " vardir: $(VARDIR)" - @echo " mandir: $(MANDIR)" - @echo " privatedir: $(PRIVATE_DIR)" - @echo " configdir: $(CONFIGDIR)" - @echo " lockdir: $(LOCKDIR)" - @echo " statedir: $(STATEDIR)" - @echo " cachedir: $(CACHEDIR)" - @echo " piddir: $(PIDDIR)" - @echo " nmbdsocketdir: $(NMBSOCKETDIR)" - @echo " swatdir: $(SWATDIR)" - @echo " datadir: ${DATADIR}" - @echo " codepagedir: $(CODEPAGEDIR)" + @echo " prefix: $(prefix)" + @echo " exec_prefix: $(exec_prefix)" + @echo " sysconfdir: $(sysconfdir)" + @echo " localstatedir: $(localstatedir)" + @echo " datarootdir: $(datarootdir)" + @echo " BINDIR: $(BINDIR)" + @echo " SBINDIR: $(SBINDIR)" + @echo " LIBDIR: $(LIBDIR)" +# @echo " LIBEXECDIR: $(LIBEXECDIR)" + @echo " MANDIR: $(MANDIR)" + @echo " DATADIR: $(DATADIR)" + @echo " LOCALEDIR: $(LOCALEDIR)" +# @echo " SCRIPTSBINDIR: $(SCRIPTSBINDIR)" +# @echo " PYTHONDIR: $(PYTHONDIR)" +# @echo " PYTHONARCHDIR: $(PYTHONARCHDIR)" + @echo " MODULESDIR: $(MODULESDIR)" + @echo " INCLUDEDIR: $(INCLUDEDIR)" + @echo " SETUPDIR: $(SETUPDIR)" +# @echo " PKGCONFIGDIR: $(PKGCONFIGDIR)" + @echo " SWATDIR: $(SWATDIR)" + @echo " CODEPAGEDIR: $(CODEPAGEDIR)" + @echo " PAMMODULESDIR: $(PAMMODULESDIR)" + @echo " CONFIGDIR: $(CONFIGDIR)" + @echo " PRIVATE_DIR: $(PRIVATE_DIR)" + @echo " LOCKDIR: $(LOCKDIR)" + @echo " PIDDIR: $(PIDDIR)" + @echo " STATEDIR: $(STATEDIR)" + @echo " CACHEDIR: $(CACHEDIR)" + @echo " LOGFILEBASE: $(LOGFILEBASE)" + @echo " SOCKET_DIR: $(SOCKET_DIR)" + @echo " PRIVILEGED_SOCKET_DIR: $(PRIVILEGED_SOCKET_DIR)" +# @echo " WINBINDD_SOCKET_DIR: $(WINBINDD_SOCKET_DIR)" +# @echo " WINBINDD_PRIVILEGED_SOCKET_DIR: $(WINBINDD_PRIVILEGED_SOCKET_DIR)" + @echo " NMBDSOCKETDIR: $(NMBDSOCKETDIR)" +# @echo " NTP_SIGND_SOCKET_DIR: $(NTP_SIGND_SOCKET_DIR)" + @echo " NCALRPCDIR: $(NCALRPCDIR)" + @echo " CONFIGFILE: $(CONFIGFILE)" + @echo " LMHOSTSFILE: $(LMHOSTSFILE)" + @echo " SMB_PASSWD_FILE: $(SMB_PASSWD_FILE)" uninstall:: uninstallmo uninstallman uninstallservers uninstallbin uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs @UNINSTALL_PAM_MODULES@