summaryrefslogtreecommitdiff
path: root/source4/lib/basic.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-02-23 15:52:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:52:05 -0500
commitdfc517b05395d925a4d7b1ce9633a849f9468e70 (patch)
treea81c020c89022980e6fbb68116648da217fbb0fc /source4/lib/basic.mk
parent80c8a522861068e7b0974986936f65052dd6f70f (diff)
downloadsamba-dfc517b05395d925a4d7b1ce9633a849f9468e70.tar.gz
samba-dfc517b05395d925a4d7b1ce9633a849f9468e70.tar.bz2
samba-dfc517b05395d925a4d7b1ce9633a849f9468e70.zip
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)
Diffstat (limited to 'source4/lib/basic.mk')
-rw-r--r--source4/lib/basic.mk42
1 files changed, 3 insertions, 39 deletions
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