From 77b400764e3dadfa05407343af649ad9298cc085 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 20 Jan 2008 16:28:43 +0100 Subject: [PATCH] build: Demote a bunch of libraries to subsystems. This makes packaging easier and should also make it easier to migrate to a new build system. --- source/lib/ldb/python.mk | 4 ---- source/lib/nss_wrapper/config.mk | 5 +---- source/lib/policy/config.mk | 2 +- source/lib/samba3/config.mk | 5 +---- source/lib/socket_wrapper/config.mk | 5 +---- source/lib/tdr/config.mk | 5 +---- source/libnet/config.mk | 5 +---- source/librpc/config.mk | 15 +++------------ source/nsswitch/config.mk | 5 +---- source/ntptr/config.mk | 2 +- source/ntvfs/config.mk | 5 +---- source/param/config.mk | 5 +---- source/scripting/ejs/config.mk | 12 +----------- source/smbd/config.mk | 6 +----- source/smbd/process_model.mk | 9 +-------- 15 files changed, 16 insertions(+), 74 deletions(-) diff --git a/source/lib/ldb/python.mk b/source/lib/ldb/python.mk index 24ade8f9777..bbd4c1c5ebd 100644 --- a/source/lib/ldb/python.mk +++ b/source/lib/ldb/python.mk @@ -1,8 +1,4 @@ -####################### -# Start LIBRARY swig_ldb [PYTHON::swig_ldb] PUBLIC_DEPENDENCIES = LIBLDB CFLAGS = -Ilib/ldb/include SWIG_FILE = ldb.i -# End LIBRARY swig_ldb -####################### diff --git a/source/lib/nss_wrapper/config.mk b/source/lib/nss_wrapper/config.mk index 9751d2bf734..b46f7c3ee7a 100644 --- a/source/lib/nss_wrapper/config.mk +++ b/source/lib/nss_wrapper/config.mk @@ -1,9 +1,6 @@ ############################## # Start SUBSYSTEM NSS_WRAPPER -[LIBRARY::NSS_WRAPPER] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Wrapper library for testing nss calls without being root +[SUBSYSTEM::NSS_WRAPPER] PUBLIC_HEADERS = nss_wrapper.h OBJ_FILES = nss_wrapper.o # End SUBSYSTEM NSS_WRAPPER diff --git a/source/lib/policy/config.mk b/source/lib/policy/config.mk index f404d583773..aae98b86b2e 100644 --- a/source/lib/policy/config.mk +++ b/source/lib/policy/config.mk @@ -1,4 +1,4 @@ -[LIBRARY::LIBPOLICY] +[SUBSYSTEM::LIBPOLICY] CFLAGS = -Iheimdal/lib/roken OBJ_FILES = lex.o parse_adm.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET diff --git a/source/lib/samba3/config.mk b/source/lib/samba3/config.mk index 76f1ce50967..705bdd40026 100644 --- a/source/lib/samba3/config.mk +++ b/source/lib/samba3/config.mk @@ -1,9 +1,6 @@ ################################################ # Start SUBSYSTEM LIBSAMBA3 -[LIBRARY::LIBSAMBA3] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Library for reading Samba3 data files +[SUBSYSTEM::LIBSAMBA3] PRIVATE_PROTO_HEADER = samba3_proto.h PUBLIC_HEADERS = samba3.h OBJ_FILES = tdbsam.o policy.o \ diff --git a/source/lib/socket_wrapper/config.mk b/source/lib/socket_wrapper/config.mk index 9e194230dc1..4c5cf943485 100644 --- a/source/lib/socket_wrapper/config.mk +++ b/source/lib/socket_wrapper/config.mk @@ -1,9 +1,6 @@ ############################## # Start SUBSYSTEM SOCKET_WRAPPER -[LIBRARY::SOCKET_WRAPPER] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets +[SUBSYSTEM::SOCKET_WRAPPER] PUBLIC_HEADERS = socket_wrapper.h OBJ_FILES = socket_wrapper.o PRIVATE_DEPENDENCIES = EXT_SOCKET diff --git a/source/lib/tdr/config.mk b/source/lib/tdr/config.mk index f0e24c54b4a..b8473e5ba83 100644 --- a/source/lib/tdr/config.mk +++ b/source/lib/tdr/config.mk @@ -1,9 +1,6 @@ -[LIBRARY::TDR] +[SUBSYSTEM::TDR] CFLAGS = -Ilib/tdr PUBLIC_HEADERS = tdr.h -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Simple marshall/unmarshall library PUBLIC_PROTO_HEADER = tdr_proto.h PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL OBJ_FILES = tdr.o diff --git a/source/libnet/config.mk b/source/libnet/config.mk index aadd3b88d0a..9041ff5a23a 100644 --- a/source/libnet/config.mk +++ b/source/libnet/config.mk @@ -1,7 +1,4 @@ -[LIBRARY::LIBSAMBA-NET] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Convenient high level access to Samba management interfaces +[SUBSYSTEM::LIBSAMBA-NET] PRIVATE_PROTO_HEADER = libnet_proto.h PUBLIC_HEADERS = libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \ libnet_rpc.h libnet_share.h libnet_time.h \ diff --git a/source/librpc/config.mk b/source/librpc/config.mk index 8774f2fd172..4d4167ba04a 100644 --- a/source/librpc/config.mk +++ b/source/librpc/config.mk @@ -36,10 +36,7 @@ MANPAGE = tools/ndrdump.1 ################################################ # Start SUBSYSTEM NDR_COMPRESSION -[LIBRARY::NDR_COMPRESSION] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = NDR support for compressed subcontexts +[SUBSYSTEM::NDR_COMPRESSION] PRIVATE_PROTO_HEADER = ndr/ndr_compression.h OBJ_FILES = \ ndr/ndr_compression.o @@ -370,13 +367,10 @@ OBJ_FILES = gen_ndr/ndr_svcctl_c.o PUBLIC_HEADERS = gen_ndr/ndr_svcctl_c.h PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL -[LIBRARY::dcerpc_atsvc] +[SUBSYSTEM::dcerpc_atsvc] OBJ_FILES = gen_ndr/ndr_atsvc_c.o PUBLIC_HEADERS = gen_ndr/ndr_atsvc_c.h PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = DCE/RPC client library - ATSVC [SUBSYSTEM::RPC_NDR_EVENTLOG] OBJ_FILES = gen_ndr/ndr_eventlog_c.o @@ -410,12 +404,9 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG OBJ_FILES = gen_ndr/ndr_initshutdown_c.o PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN -[LIBRARY::dcerpc_mgmt] +[SUBSYSTEM::dcerpc_mgmt] OBJ_FILES = gen_ndr/ndr_mgmt_c.o PRIVATE_DEPENDENCIES = NDR_MGMT -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = DCE/RPC client library - MGMT [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE] OBJ_FILES = gen_ndr/ndr_protected_storage_c.o diff --git a/source/nsswitch/config.mk b/source/nsswitch/config.mk index 89820245165..621939256c9 100644 --- a/source/nsswitch/config.mk +++ b/source/nsswitch/config.mk @@ -1,7 +1,4 @@ -[LIBRARY::LIBWINBIND-CLIENT] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Client library for communicating with winbind +[SUBSYSTEM::LIBWINBIND-CLIENT] OBJ_FILES = wb_common.o PRIVATE_DEPENDENCIES = SOCKET_WRAPPER diff --git a/source/ntptr/config.mk b/source/ntptr/config.mk index 38a582291f3..4c1f46ff170 100644 --- a/source/ntptr/config.mk +++ b/source/ntptr/config.mk @@ -14,7 +14,7 @@ PRIVATE_DEPENDENCIES = \ ################################################ # Start SUBSYSTEM ntptr -[LIBRARY::ntptr] +[SUBSYSTEM::ntptr] PRIVATE_PROTO_HEADER = ntptr_proto.h OBJ_FILES = \ ntptr_base.o \ diff --git a/source/ntvfs/config.mk b/source/ntvfs/config.mk index ae8d5d9b4ab..017614b7bed 100644 --- a/source/ntvfs/config.mk +++ b/source/ntvfs/config.mk @@ -79,11 +79,8 @@ OBJ_FILES = \ ################################################ # Start SUBSYSTEM NTVFS -[LIBRARY::ntvfs] +[SUBSYSTEM::ntvfs] PUBLIC_HEADERS = ntvfs.h -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Virtual File System with NTFS semantics PRIVATE_PROTO_HEADER = ntvfs_proto.h OBJ_FILES = \ ntvfs_base.o \ diff --git a/source/param/config.mk b/source/param/config.mk index b28f6639c04..f7d5d03d43b 100644 --- a/source/param/config.mk +++ b/source/param/config.mk @@ -14,10 +14,7 @@ PUBLIC_HEADERS = param.h ################################# # Start SUBSYSTEM share -[LIBRARY::share] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Services Configuration Library +[SUBSYSTEM::share] PUBLIC_HEADERS = share.h PUBLIC_PROTO_HEADER = share_proto.h OBJ_FILES = share.o diff --git a/source/scripting/ejs/config.mk b/source/scripting/ejs/config.mk index 8b680ba973a..656ecdae162 100644 --- a/source/scripting/ejs/config.mk +++ b/source/scripting/ejs/config.mk @@ -1,10 +1,6 @@ -####################### -# Start LIBRARY EJSRPC [SUBSYSTEM::EJSRPC] OBJ_FILES = \ ejsrpc.o -# End SUBSYSTEM EJSRPC -####################### [MODULE::smbcalls_config] OBJ_FILES = smbcalls_config.o @@ -79,11 +75,7 @@ INIT_FUNCTION = smb_setup_ejs_system include ejsnet/config.mk -####################### -# Start LIBRARY smbcalls -[LIBRARY::smbcalls] -SO_VERSION = 0 -VERSION = 0.0.1 +[SUBSYSTEM::smbcalls] PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ smbcalls.o \ @@ -101,8 +93,6 @@ PRIVATE_DEPENDENCIES = \ CREDENTIALS POPT_CREDENTIALS POPT_SAMBA \ dcerpc \ NDR_TABLE -# End SUBSYSTEM smbcalls -####################### ####################### # Start BINARY SMBSCRIPT diff --git a/source/smbd/config.mk b/source/smbd/config.mk index ea0df63f321..c4d1070992e 100644 --- a/source/smbd/config.mk +++ b/source/smbd/config.mk @@ -10,9 +10,7 @@ PRIVATE_DEPENDENCIES = \ # End MODULE server_auth ################################################ -####################### -# Start SUBSERVICE -[LIBRARY::service] +[SUBSYSTEM::service] PRIVATE_PROTO_HEADER = service_proto.h OBJ_FILES = \ service.o \ @@ -20,8 +18,6 @@ OBJ_FILES = \ service_task.o PRIVATE_DEPENDENCIES = \ MESSAGING samba-socket -# End SUBSYSTEM SERVER -####################### [SUBSYSTEM::PIDFILE] OBJ_FILES = pidfile.o diff --git a/source/smbd/process_model.mk b/source/smbd/process_model.mk index 4d927a640c8..d6b7698e74f 100644 --- a/source/smbd/process_model.mk +++ b/source/smbd/process_model.mk @@ -32,15 +32,8 @@ PRIVATE_DEPENDENCIES = PTHREAD # End MODULE process_model_thread ################################################ -################################################ -# Start SUBSYSTEM process_model -[LIBRARY::process_model] -VERSION = 0.0.1 -SO_VERSION = 0 +[SUBSYSTEM::process_model] PRIVATE_PROTO_HEADER = process_model_proto.h OBJ_FILES = \ process_model.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG -# -# End SUBSYSTEM process_model -################################################ -- 2.34.1