Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry

[ira/wip.git] / source4 / lib / basic.mk

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 58cbca0198ab4b1959bde1f93423fb8cd263cdee..b86df5dc9f48d3443c9f65bd2acbad8a2131a30c 100644 (file)
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -1,86 +1,25 @@
-# LIB BASIC subsystem
+[SUBSYSTEM::LIBCOMPRESSION]
 
-##############################
-# Start SUBSYSTEM LIBNETIF
-[SUBSYSTEM::LIBNETIF]
-INIT_OBJ_FILES = \
-               lib/netif/interface.o
-ADD_OBJ_FILES = \
-               lib/netif/netif.o
-# End SUBSYSTEM LIBNETIF
-##############################
+LIBCOMPRESSION_OBJ_FILES = $(libcompressionsrcdir)/mszip.o
 
-##############################
-# Start SUBSYSTEM LIBCRYPTO
-[SUBSYSTEM::LIBCRYPTO]
-NOPROTO = YES
-INIT_OBJ_FILES = \
-               lib/crypto/crc32.o
-ADD_OBJ_FILES = \
-               lib/crypto/md5.o \
-               lib/crypto/hmacmd5.o \
-               lib/crypto/md4.o
-# End SUBSYSTEM LIBCRYPTO
-##############################
+[SUBSYSTEM::GENCACHE]
+PRIVATE_DEPENDENCIES = TDB_WRAP
 
-################################################
-# Start SUBSYSTEM LIBCOMPRESSION
-[SUBSYSTEM::LIBCOMPRESSION]
-INIT_OBJ_FILES = \
-               lib/compression/mszip.o
-# End SUBSYSTEM LIBCOMPRESION
-################################################
+GENCACHE_OBJ_FILES = $(libgencachesrcdir)/gencache.o
 
+# PUBLIC_HEADERS += $(libgencachesrcdir)/gencache.h
 
-################################################
-# Start SUBSYSTEM LIBSAMBA3
-[SUBSYSTEM::LIBSAMBA3]
-INIT_OBJ_FILES = \
-               lib/samba3/smbpasswd.o
-# End SUBSYSTEM LIBSAMBA3
-################################################
+[SUBSYSTEM::LDB_WRAP]
+PUBLIC_DEPENDENCIES = LIBLDB
+PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
 
-[SUBSYSTEM::PAM_ERRORS]
-OBJ_FILES = lib/pam_errors.o
+LDB_WRAP_OBJ_FILES = $(libsrcdir)/ldb_wrap.o
+PUBLIC_HEADERS += $(libsrcdir)/ldb_wrap.h
 
-[SUBSYSTEM::GENCACHE]
-OBJ_FILES = \
-               lib/gencache.o \
+[SUBSYSTEM::TDB_WRAP]
+PUBLIC_DEPENDENCIES = LIBTDB
 
-##############################
-# Start SUBSYSTEM LIBBASIC
-[SUBSYSTEM::LIBBASIC]
-INIT_OBJ_FILES = lib/version.o
-ADD_OBJ_FILES = \
-               lib/xfile.o \
-               lib/debug.o \
-               lib/fault.o \
-               lib/pidfile.o \
-               lib/signal.o \
-               lib/system.o \
-               lib/time.o \
-               lib/genrand.o \
-               lib/dprintf.o \
-               lib/util_str.o \
-               lib/util_strlist.o \
-               lib/util_unistr.o \
-               lib/util_file.o \
-               lib/data_blob.o \
-               lib/util.o \
-               lib/util_sock.o \
-               lib/substitute.o \
-               lib/fsusage.o \
-               lib/ms_fnmatch.o \
-               lib/select.o \
-               lib/mutex.o \
-               lib/idtree.o \
-               lib/unix_privs.o \
-               lib/db_wrap.o \
-               lib/gendb.o \
-               lib/credentials.o
-REQUIRED_SUBSYSTEMS = \
-               LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
-               SOCKET_WRAPPER CONFIG
-# End SUBSYSTEM LIBBASIC
-##############################
+TDB_WRAP_OBJ_FILES = $(libsrcdir)/tdb_wrap.o
+PUBLIC_HEADERS += $(libsrcdir)/tdb_wrap.h
 
+SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)