From dfc517b05395d925a4d7b1ce9633a849f9468e70 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 23 Feb 2006 15:52:24 +0000
Subject: r13658: More moving around of files:  - Collect the generic utility
 functions into a lib/util/ (a la GLib is 		for the GNOME folks) 
 - Remove even more files from include/ (This used to be commit
 ba62880f5b05c2a505dc7f54676b231197a7e707)

---
 source4/lib/basic.mk | 42 +++---------------------------------------
 1 file changed, 3 insertions(+), 39 deletions(-)

(limited to 'source4/lib/basic.mk')

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index d5bff95f01..51ca3378a2 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -16,6 +16,7 @@ include socket_wrapper/config.mk
 include appweb/config.mk
 include replace/config.mk
 include stream/config.mk
+include util/config.mk
 
 ##############################
 # Start SUBSYSTEM LIBNETIF
@@ -57,50 +58,13 @@ OBJ_FILES = \
 ################################################
 
 [SUBSYSTEM::GENCACHE]
-PRIVATE_PROTO_HEADER = gencache.h
+PRIVATE_PROTO_HEADER = gencache/gencache.h
 OBJ_FILES = \
-		gencache.o \
-
-##############################
-# Start SUBSYSTEM LIBBASIC
-[SUBSYSTEM::LIBBASIC]
-PRIVATE_PROTO_HEADER = basic.h
-OBJ_FILES = version.o \
-		xfile.o \
-		debug.o \
-		fault.o \
-		signal.o \
-		system.o \
-		time.o \
-		genrand.o \
-		dprintf.o \
-		util_str.o \
-		util_strlist.o \
-		util_unistr.o \
-		util_file.o \
-		data_blob.o \
-		util.o \
-		util_sock.o \
-		substitute.o \
-		fsusage.o \
-		ms_fnmatch.o \
-		select.o \
-		mutex.o \
-		idtree.o \
-		module.o
-REQUIRED_SUBSYSTEMS = \
-		CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \
-		SOCKET_WRAPPER CONFIG
-# End SUBSYSTEM LIBBASIC
-##############################
+		gencache/gencache.o \
 
 [SUBSYSTEM::DB_WRAP]
 OBJ_FILES = db_wrap.o \
 		gendb.o
 REQUIRED_SUBSYSTEMS = LIBLDB LIBTDB
 
-[SUBSYSTEM::PIDFILE]
-OBJ_FILES = pidfile.o
 
-[SUBSYSTEM::UNIX_PRIVS]
-OBJ_FILES = unix_privs.o
-- 
cgit