summaryrefslogtreecommitdiff
path: root/source4/lib/basic.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-18 20:35:01 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-18 20:35:01 +0200
commit08067d22a0cb24fe1b9d6230634aea89c493bd4e (patch)
treed6421f3eb3c94a27ee99ecf73a7cf31809e5dc09 /source4/lib/basic.mk
parent964257956d4046658c6177a2423c55d2c5bb9f45 (diff)
parent333c169529a3f64a28fcaff1056069867fd56a90 (diff)
downloadsamba-08067d22a0cb24fe1b9d6230634aea89c493bd4e.tar.gz
samba-08067d22a0cb24fe1b9d6230634aea89c493bd4e.tar.bz2
samba-08067d22a0cb24fe1b9d6230634aea89c493bd4e.zip
Merge branch 'v4-0-test' of /home/jelmer/samba4 into v4-0-test
(This used to be commit 63fd551a159b3ad4e314f551d65b7d723bbe485a)
Diffstat (limited to 'source4/lib/basic.mk')
-rw-r--r--source4/lib/basic.mk34
1 files changed, 7 insertions, 27 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index e7e0ba80c4..b86df5dc9f 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -1,45 +1,25 @@
-# LIB BASIC subsystem
-mkinclude samba3/config.mk
-mkinclude socket/config.mk
-mkinclude charset/config.mk
-mkinclude ldb-samba/config.mk
-mkinclude tls/config.mk
-mkinclude registry/config.mk
-mkinclude messaging/config.mk
-mkinclude events/config.mk
-mkinclude cmdline/config.mk
-mkinclude socket_wrapper/config.mk
-mkinclude nss_wrapper/config.mk
-mkinclude appweb/config.mk
-mkinclude stream/config.mk
-mkinclude util/config.mk
-mkinclude tdr/config.mk
-mkinclude dbwrap/config.mk
-mkinclude crypto/config.mk
-mkinclude torture/config.mk
-
[SUBSYSTEM::LIBCOMPRESSION]
-LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
+LIBCOMPRESSION_OBJ_FILES = $(libcompressionsrcdir)/mszip.o
[SUBSYSTEM::GENCACHE]
PRIVATE_DEPENDENCIES = TDB_WRAP
-GENCACHE_OBJ_FILES = gencache/gencache.o
+GENCACHE_OBJ_FILES = $(libgencachesrcdir)/gencache.o
-# PUBLIC_HEADERS += lib/gencache/gencache.h
+# PUBLIC_HEADERS += $(libgencachesrcdir)/gencache.h
[SUBSYSTEM::LDB_WRAP]
PUBLIC_DEPENDENCIES = LIBLDB
PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
-LDB_WRAP_OBJ_FILES = lib/ldb_wrap.o
-PUBLIC_HEADERS += lib/ldb_wrap.h
+LDB_WRAP_OBJ_FILES = $(libsrcdir)/ldb_wrap.o
+PUBLIC_HEADERS += $(libsrcdir)/ldb_wrap.h
[SUBSYSTEM::TDB_WRAP]
PUBLIC_DEPENDENCIES = LIBTDB
-TDB_WRAP_OBJ_FILES = lib/tdb_wrap.o
-PUBLIC_HEADERS += lib/tdb_wrap.h
+TDB_WRAP_OBJ_FILES = $(libsrcdir)/tdb_wrap.o
+PUBLIC_HEADERS += $(libsrcdir)/tdb_wrap.h
SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)