diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 18:49:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 18:49:43 +0200 |
| commit | f36e51617c7bd316f3ef393532bbc169895d6a66 (patch) | |
| tree | 2c7acd2c3d2bf96a78b0e740caea39219320bd7d | |
| parent | 4ba0453c3ca98ed0ac27e4aa04d36d0bdc42f9e8 (diff) | |
| download | samba-f36e51617c7bd316f3ef393532bbc169895d6a66.tar.gz samba-f36e51617c7bd316f3ef393532bbc169895d6a66.tar.bz2 samba-f36e51617c7bd316f3ef393532bbc169895d6a66.zip | |
Don't include a (relative path) srcdir in samba4-data.mk.
| -rw-r--r-- | source3/Makefile.in | 6 | ||||
| -rw-r--r-- | source3/samba4.m4 | 2 | ||||
| -rw-r--r-- | source3/samba4.mk | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 01255df087..25c3a590ca 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1154,9 +1154,11 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \ ###################################################################### # now the rules... ###################################################################### -all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ +all:: SHOWFLAGS basics libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \ $(MODULES) $(NSS_MODULES) $(PAM_MODULES) @EXTRA_ALL_TARGETS@ +basics:: + nss_modules:: $(NSS_MODULES) pam_modules:: $(PAM_MODULES) @@ -1167,7 +1169,7 @@ pam_winbind: SHOWFLAGS bin/pam_winbind.@SHLIBEXT@ gpext_modules:: $(GPEXT_MODULES) -torture:: SHOWFLAGS $(TORTURE_PROGS) +torture:: SHOWFLAGS basics $(TORTURE_PROGS) smbtorture : SHOWFLAGS bin/smbtorture@EXEEXT@ diff --git a/source3/samba4.m4 b/source3/samba4.m4 index ed49347cb6..15fffb9e73 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -125,7 +125,7 @@ m4_include(nsswitch/config.m4) dnl Samba 4 files AC_SUBST(LD) AC_LIBREPLACE_SHLD_FLAGS -SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS]) +SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir]) oldbuilddir="$builddir" builddir="$builddir/../source4" diff --git a/source3/samba4.mk b/source3/samba4.mk index 27fb210beb..5d1f0d1052 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -158,6 +158,6 @@ clean:: proto:: $(PROTO_HEADERS) modules:: $(PLUGINS) -all:: basics bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 -torture:: basics bin/smbtorture4 -everything:: basics $(patsubst %,%4,$(BINARIES)) +all:: bin/samba4 bin/regpatch4 bin/regdiff4 bin/regshell4 bin/regtree4 bin/smbclient4 +torture:: bin/smbtorture4 +everything:: $(patsubst %,%4,$(BINARIES)) |