From 80a5da73e9a9ed148314be3fa071181c82fc7c64 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 14:36:41 +0200 Subject: Share talloc source code between Samba 3 and Samba 4. --- source4/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 546eb072d8..bdc6cce2f3 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -103,6 +103,7 @@ pyscriptsrcdir := $(srcdir)/scripting/python kdcsrcdir := kdc ntp_signdsrcdir := ntp_signd wmisrcdir := lib/wmi +tallocsrcdir := ../talloc include data.mk -- cgit From 7111645d3c46e55b2c180e3db0ba8a3c670a3c31 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 15:16:31 +0200 Subject: Use single copy of tdb in both samba3 and samba4. --- source4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 546eb072d8..2ec5e29e6a 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -62,7 +62,7 @@ libsrcdir := lib libsocketsrcdir := lib/socket libcharsetsrcdir := lib/charset ldb_sambasrcdir := lib/ldb-samba -tdbsrcdir := lib/tdb +tdbsrcdir := ../tdb ldbsrcdir := lib/ldb libtlssrcdir := lib/tls libregistrysrcdir := lib/registry -- cgit From 41669237cd714c59af9e634cb2ac162d6ee57e82 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 16:39:45 +0200 Subject: Use single copy of socket_wrapper in Samba 3 and Samba 4. --- source4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 546eb072d8..2dd0af0389 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -71,7 +71,7 @@ libmessagingsrcdir := lib/messaging libeventssrcdir := lib/events libcmdlinesrcdir := lib/cmdline poptsrcdir := lib/popt -socketwrappersrcdir := lib/socket_wrapper +socketwrappersrcdir := ../socket_wrapper nsswrappersrcdir := lib/nss_wrapper appwebsrcdir := lib/appweb libstreamsrcdir := lib/stream -- cgit From ca2da6154068c8fb9ef89407d34deb9bb8f5fbfa Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 17:05:00 +0200 Subject: Use single cope of nss_wrapper in Samba 3 and Samba 4. --- source4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 546eb072d8..f54a0eb5c3 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -72,7 +72,7 @@ libeventssrcdir := lib/events libcmdlinesrcdir := lib/cmdline poptsrcdir := lib/popt socketwrappersrcdir := lib/socket_wrapper -nsswrappersrcdir := lib/nss_wrapper +nsswrappersrcdir := ../nss_wrapper appwebsrcdir := lib/appweb libstreamsrcdir := lib/stream libutilsrcdir := lib/util -- cgit From c8bff39df639c70afc94b1795c94629ee8b7b482 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 17:20:16 +0200 Subject: Use a single copy of popt in samba3 and samba4. --- source4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 546eb072d8..41328cf03c 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -70,7 +70,7 @@ smbreadlinesrcdir := lib/smbreadline libmessagingsrcdir := lib/messaging libeventssrcdir := lib/events libcmdlinesrcdir := lib/cmdline -poptsrcdir := lib/popt +poptsrcdir := ../popt socketwrappersrcdir := lib/socket_wrapper nsswrappersrcdir := lib/nss_wrapper appwebsrcdir := lib/appweb -- cgit From 9c466a61588cf7eb442450d57cf2a46355e8907a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 19:07:02 +0200 Subject: Use single copy of compression library in Samba3,4. --- source4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 546eb072d8..5d23cad3ff 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -81,7 +81,7 @@ libdbwrapsrcdir := lib/dbwrap libcryptosrcdir := lib/crypto libtorturesrcdir := lib/torture smb_serversrcdir := smb_server -libcompressionsrcdir := lib/compression +libcompressionsrcdir := ../compression libgencachesrcdir := lib paramsrcdir := param rpc_serversrcdir := rpc_server -- cgit From 94855cd69248f0f90b6c828588afa012adc8bd45 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 17 Sep 2008 14:11:12 +0200 Subject: Move common libraries from root to lib/. --- source4/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 04f0ae9457..91390d833f 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -62,7 +62,7 @@ libsrcdir := lib libsocketsrcdir := lib/socket libcharsetsrcdir := lib/charset ldb_sambasrcdir := lib/ldb-samba -tdbsrcdir := ../tdb +tdbsrcdir := ../lib/tdb ldbsrcdir := lib/ldb libtlssrcdir := lib/tls libregistrysrcdir := lib/registry @@ -70,9 +70,9 @@ smbreadlinesrcdir := lib/smbreadline libmessagingsrcdir := lib/messaging libeventssrcdir := lib/events libcmdlinesrcdir := lib/cmdline -poptsrcdir := ../popt -socketwrappersrcdir := ../socket_wrapper -nsswrappersrcdir := ../nss_wrapper +poptsrcdir := ../lib/popt +socketwrappersrcdir := ../lib/socket_wrapper +nsswrappersrcdir := ../lib/nss_wrapper appwebsrcdir := lib/appweb libstreamsrcdir := lib/stream libutilsrcdir := lib/util @@ -81,7 +81,7 @@ libdbwrapsrcdir := lib/dbwrap libcryptosrcdir := lib/crypto libtorturesrcdir := lib/torture smb_serversrcdir := smb_server -libcompressionsrcdir := ../compression +libcompressionsrcdir := ../lib/compression libgencachesrcdir := lib paramsrcdir := param rpc_serversrcdir := rpc_server @@ -103,7 +103,7 @@ pyscriptsrcdir := $(srcdir)/scripting/python kdcsrcdir := kdc ntp_signdsrcdir := ntp_signd wmisrcdir := lib/wmi -tallocsrcdir := ../talloc +tallocsrcdir := ../lib/talloc include data.mk -- cgit From b16a8f31ad7b6434b44e24e96b72d877a7ede356 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 17 Sep 2008 17:13:02 +0200 Subject: Fix location of included popt files for systems that don't have popt. --- source4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 91390d833f..7a5ec4c0d0 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -8,7 +8,7 @@ default: all include mkconfig.mk -pidldir := $(srcdir)/pidl +pidldir := $(srcdir)/../pidl BASEDIR = $(prefix) TORTUREDIR = $(libdir)/torture -- cgit