1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00

Use variables for source directory in remaining subsystems.

This commit is contained in:
Jelmer Vernooij 2008-05-18 20:30:46 +02:00
parent 28f4a8bc2c
commit 6b6b2196a8
19 changed files with 90 additions and 71 deletions

View File

@ -4,7 +4,7 @@
# End SUBSYSTEM MPR
#######################
MPR_OBJ_FILES = $(addprefix lib/appweb/mpr/, miniMpr.o var.o)
MPR_OBJ_FILES = $(addprefix $(appwebsrcdir)/mpr/, miniMpr.o var.o)
#######################
# Start SUBSYSTEM EJS
@ -13,7 +13,7 @@ PUBLIC_DEPENDENCIES = MPR
# End SUBSYSTEM EJS
#######################
EJS_OBJ_FILES = $(addprefix lib/appweb/ejs/, ejsLib.o ejsLex.o ejsParser.o ejsProcs.o)
EJS_OBJ_FILES = $(addprefix $(appwebsrcdir)/ejs/, ejsLib.o ejsLex.o ejsParser.o ejsProcs.o)
#######################
# Start SUBSYSTEM ESP
@ -22,4 +22,4 @@ PUBLIC_DEPENDENCIES = EJS
# End SUBSYSTEM ESP
#######################
ESP_OBJ_FILES = $(addprefix lib/appweb/esp/, esp.o espProcs.o)
ESP_OBJ_FILES = $(addprefix $(appwebsrcdir)/esp/, esp.o espProcs.o)

View File

@ -1,25 +1,25 @@
[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)

View File

@ -7,6 +7,6 @@ PRIVATE_DEPENDENCIES = DYNCONFIG
# End SUBSYSTEM CHARSET
################################################
CHARSET_OBJ_FILES = $(addprefix lib/charset/, iconv.o charcnv.o util_unistr.o)
CHARSET_OBJ_FILES = $(addprefix $(libcharsetsrcdir)/, iconv.o charcnv.o util_unistr.o)
PUBLIC_HEADERS += lib/charset/charset.h
PUBLIC_HEADERS += $(libcharsetsrcdir)/charset.h

View File

@ -2,18 +2,18 @@
PRIVATE_PROTO_HEADER = credentials.h
PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
LIBCMDLINE_CREDENTIALS_OBJ_FILES = lib/cmdline/credentials.o
LIBCMDLINE_CREDENTIALS_OBJ_FILES = $(libcmdlinesrcdir)/credentials.o
[SUBSYSTEM::POPT_SAMBA]
PUBLIC_DEPENDENCIES = LIBPOPT
POPT_SAMBA_OBJ_FILES = lib/cmdline/popt_common.o
POPT_SAMBA_OBJ_FILES = $(libcmdlinesrcdir)/popt_common.o
PUBLIC_HEADERS += lib/cmdline/popt_common.h
PUBLIC_HEADERS += $(libcmdlinesrcdir)/popt_common.h
[SUBSYSTEM::POPT_CREDENTIALS]
PRIVATE_PROTO_HEADER = popt_credentials.h
PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT
PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
POPT_CREDENTIALS_OBJ_FILES = lib/cmdline/popt_credentials.o
POPT_CREDENTIALS_OBJ_FILES = $(libcmdlinesrcdir)/popt_credentials.o

View File

@ -4,7 +4,7 @@
# End SUBSYSTEM LIBCRYPTO
##############################
LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
crc32.o md5.o hmacmd5.o md4.o \
arcfour.o sha1.o hmacsha1.o)
@ -14,6 +14,6 @@ SUBSYSTEM = smbtorture
PRIVATE_DEPENDENCIES = LIBCRYPTO
PRIVATE_PROTO_HEADER = test_proto.h
TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix $(libcryptosrcdir)/, \
md4test.o md5test.o hmacmd5test.o sha1test.o hmacsha1test.o)

View File

@ -2,5 +2,5 @@
PUBLIC_DEPENDENCIES = \
LIBTDB ctdb
LIBDBWRAP_OBJ_FILES = $(addprefix lib/dbwrap/, dbwrap.o dbwrap_tdb.o dbwrap_ctdb.o)
LIBDBWRAP_OBJ_FILES = $(addprefix $(libdbwrapsrcdir)/, dbwrap.o dbwrap_tdb.o dbwrap_ctdb.o)

View File

@ -15,7 +15,7 @@ SUBSYSTEM = LIBEVENTS
INIT_FUNCTION = s4_events_aio_init
##############################
EVENTS_AIO_OBJ_FILES = lib/events/events_aio.o
EVENTS_AIO_OBJ_FILES = $(libeventssrcdir)/events_aio.o
##############################
[MODULE::EVENTS_EPOLL]
@ -23,7 +23,7 @@ SUBSYSTEM = LIBEVENTS
INIT_FUNCTION = s4_events_epoll_init
##############################
EVENTS_EPOLL_OBJ_FILES = lib/events/events_epoll.o
EVENTS_EPOLL_OBJ_FILES = $(libeventssrcdir)/events_epoll.o
##############################
[MODULE::EVENTS_SELECT]
@ -31,7 +31,7 @@ SUBSYSTEM = LIBEVENTS
INIT_FUNCTION = s4_events_select_init
##############################
EVENTS_SELECT_OBJ_FILES = lib/events/events_select.o
EVENTS_SELECT_OBJ_FILES = $(libeventssrcdir)/events_select.o
##############################
[MODULE::EVENTS_STANDARD]
@ -39,7 +39,7 @@ SUBSYSTEM = LIBEVENTS
INIT_FUNCTION = s4_events_standard_init
##############################
EVENTS_STANDARD_OBJ_FILES = lib/events/events_standard.o
EVENTS_STANDARD_OBJ_FILES = $(libeventssrcdir)/events_standard.o
##############################
# Start SUBSYSTEM LIBEVENTS
@ -47,12 +47,12 @@ EVENTS_STANDARD_OBJ_FILES = lib/events/events_standard.o
# End SUBSYSTEM LIBEVENTS
##############################
LIBEVENTS_OBJ_FILES = $(addprefix lib/events/, events.o events_timed.o events_signal.o)
LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, events.o events_timed.o events_signal.o)
PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
PUBLIC_HEADERS += $(addprefix $(libeventssrcdir)/, events.h events_internal.h)
[PYTHON::swig_events]
SWIG_FILE = events.i
PRIVATE_DEPENDENCIES = LIBEVENTS LIBSAMBA-HOSTCONFIG
swig_events_OBJ_FILES = lib/events/events_wrap.o
swig_events_OBJ_FILES = $(libeventssrcdir)/events_wrap.o

View File

@ -7,5 +7,5 @@ PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_MISC
# End SUBSYSTEM LDBSAMBA
################################################
LDBSAMBA_OBJ_FILES = lib/ldb-samba/ldif_handlers.o
LDBSAMBA_OBJ_FILES = $(ldb_sambasrcdir)/ldif_handlers.o

View File

@ -13,5 +13,4 @@ PUBLIC_DEPENDENCIES = \
# End SUBSYSTEM MESSAGING
################################################
MESSAGING_OBJ_FILES = lib/messaging/messaging.o
MESSAGING_OBJ_FILES = $(libmessagingsrcdir)/messaging.o

View File

@ -4,4 +4,4 @@
# End SUBSYSTEM NSS_WRAPPER
##############################
NSS_WRAPPER_OBJ_FILES = lib/nss_wrapper/nss_wrapper.o
NSS_WRAPPER_OBJ_FILES = $(nsswrappersrcdir)/nss_wrapper.o

View File

@ -1,19 +1,19 @@
[SUBSYSTEM::TDR_REGF]
PUBLIC_DEPENDENCIES = TDR
TDR_REGF_OBJ_FILES = lib/registry/tdr_regf.o
TDR_REGF_OBJ_FILES = $(libregistrysrcdir)/tdr_regf.o
# Special support for external builddirs
lib/registry/regf.c: lib/registry/tdr_regf.c
$(srcdir)/lib/registry/regf.c: lib/registry/tdr_regf.c
lib/registry/tdr_regf.h: lib/registry/tdr_regf.c
lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
$(srcdir)/$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
$(libregistrysrcdir)/tdr_regf.h: $(libregistrysrcdir)/tdr_regf.c
$(libregistrysrcdir)/tdr_regf.c: $(srcdir)/$(libregistrysrcdir)/regf.idl
@CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
--header --outputdir=lib/registry \
--tdr-parser -- $(srcdir)/lib/registry/regf.idl
--tdr-parser -- $(srcdir)/$(libregistrysrcdir)/regf.idl
clean::
@-rm -f lib/registry/regf.h lib/registry/tdr_regf*
@-rm -f $(libregistrysrcdir)/regf.h $(libregistrysrcdir)/tdr_regf*
################################################
# Start SUBSYSTEM registry
@ -24,22 +24,22 @@ PUBLIC_DEPENDENCIES = \
# End MODULE registry_ldb
################################################
PC_FILES += lib/registry/registry.pc
PC_FILES += $(libregistrysrcdir)/registry.pc
registry_VERSION = 0.0.1
registry_SOVERSION = 0
registry_OBJ_FILES = $(addprefix lib/registry/, interface.o util.o samba.o \
registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/, interface.o util.o samba.o \
patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
hive.o local.o ldb.o dir.o rpc.o)
PUBLIC_HEADERS += lib/registry/registry.h
PUBLIC_HEADERS += $(libregistrysrcdir)/registry.h
[SUBSYSTEM::registry_common]
PUBLIC_DEPENDENCIES = registry
PRIVATE_PROTO_HEADER = tools/common.h
registry_common_OBJ_FILES = lib/registry/tools/common.o
registry_common_OBJ_FILES = $(libregistrysrcdir)/tools/common.o
################################################
# Start BINARY regdiff
@ -50,9 +50,9 @@ PRIVATE_DEPENDENCIES = \
# End BINARY regdiff
################################################
regdiff_OBJ_FILES = lib/registry/tools/regdiff.o
regdiff_OBJ_FILES = $(libregistrysrcdir)/tools/regdiff.o
MANPAGES += lib/registry/man/regdiff.1
MANPAGES += $(libregistrysrcdir)/man/regdiff.1
################################################
# Start BINARY regpatch
@ -64,9 +64,9 @@ PRIVATE_DEPENDENCIES = \
# End BINARY regpatch
################################################
regpatch_OBJ_FILES = lib/registry/tools/regpatch.o
regpatch_OBJ_FILES = $(libregistrysrcdir)/tools/regpatch.o
MANPAGES += lib/registry/man/regpatch.1
MANPAGES += $(libregistrysrcdir)/man/regpatch.1
################################################
# Start BINARY regshell
@ -78,9 +78,9 @@ PRIVATE_DEPENDENCIES = \
# End BINARY regshell
################################################
regshell_OBJ_FILES = lib/registry/tools/regshell.o
regshell_OBJ_FILES = $(libregistrysrcdir)/tools/regshell.o
MANPAGES += lib/registry/man/regshell.1
MANPAGES += $(libregistrysrcdir)/man/regshell.1
################################################
# Start BINARY regtree
@ -92,18 +92,18 @@ PRIVATE_DEPENDENCIES = \
# End BINARY regtree
################################################
regtree_OBJ_FILES = lib/registry/tools/regtree.o
regtree_OBJ_FILES = $(libregistrysrcdir)/tools/regtree.o
MANPAGES += lib/registry/man/regtree.1
MANPAGES += $(libregistrysrcdir)/man/regtree.1
[SUBSYSTEM::torture_registry]
PRIVATE_DEPENDENCIES = registry
PRIVATE_PROTO_HEADER = tests/proto.h
torture_registry_OBJ_FILES = $(addprefix lib/registry/tests/, generic.o hive.o diff.o registry.o)
torture_registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/tests/, generic.o hive.o diff.o registry.o)
[PYTHON::swig_registry]
PUBLIC_DEPENDENCIES = registry
SWIG_FILE = registry.i
swig_registry_OBJ_FILES = lib/registry/registry_wrap.o
swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o

View File

@ -6,7 +6,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBREPLACE_NETWORK
# End SUBSYSTEM LIBNETIF
##############################
LIBNETIF_OBJ_FILES = $(addprefix lib/socket/, interface.o netif.o)
LIBNETIF_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, interface.o netif.o)
################################################
# Start MODULE socket_ip
@ -17,7 +17,7 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-ERRORS LIBREPLACE_NETWORK
# End MODULE socket_ip
################################################
socket_ip_OBJ_FILES = lib/socket/socket_ip.o
socket_ip_OBJ_FILES = $(libsocketsrcdir)/socket_ip.o
################################################
# Start MODULE socket_unix
@ -28,7 +28,7 @@ PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
# End MODULE socket_unix
################################################
socket_unix_OBJ_FILES = lib/socket/socket_unix.o
socket_unix_OBJ_FILES = $(libsocketsrcdir)/socket_unix.o
################################################
# Start SUBSYSTEM SOCKET
@ -38,5 +38,5 @@ PRIVATE_DEPENDENCIES = SOCKET_WRAPPER LIBCLI_COMPOSITE LIBCLI_RESOLVE
# End SUBSYSTEM SOCKET
################################################
samba-socket_OBJ_FILES = $(addprefix lib/socket/, socket.o access.o connect_multi.o connect.o)
samba-socket_OBJ_FILES = $(addprefix $(libsocketsrcdir)/, socket.o access.o connect_multi.o connect.o)

View File

@ -5,4 +5,4 @@ PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
# End SUBSYSTEM SOCKET_WRAPPER
##############################
SOCKET_WRAPPER_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o
SOCKET_WRAPPER_OBJ_FILES = $(socketwrappersrcdir)/socket_wrapper.o

View File

@ -1,4 +1,4 @@
[SUBSYSTEM::LIBPACKET]
PRIVATE_DEPENDENCIES = LIBTLS
LIBPACKET_OBJ_FILES = lib/stream/packet.o
LIBPACKET_OBJ_FILES = $(libstreamsrcdir)/packet.o

View File

@ -3,6 +3,6 @@ CFLAGS = -Ilib/tdr
PRIVATE_PROTO_HEADER = tdr_proto.h
PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
TDR_OBJ_FILES = lib/tdr/tdr.o
TDR_OBJ_FILES = $(libtdrsrcdir)/tdr.o
PUBLIC_HEADERS += lib/tdr/tdr.h
PUBLIC_HEADERS += $(libtdrsrcdir)/tdr.h

View File

@ -2,4 +2,4 @@
PUBLIC_DEPENDENCIES = \
LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba-socket
LIBTLS_OBJ_FILES = lib/tls/tls.o lib/tls/tlscert.o
LIBTLS_OBJ_FILES = $(addprefix $(libtlssrcdir)/, tls.o tlscert.o)

View File

@ -8,7 +8,7 @@ PUBLIC_DEPENDENCIES = \
torture_VERSION = 0.0.1
torture_SOVERSION = 0
PC_FILES += lib/torture/torture.pc
torture_OBJ_FILES = $(addprefix lib/torture/, torture.o)
PC_FILES += $(libtorturesrcdir)/torture.pc
torture_OBJ_FILES = $(addprefix $(libtorturesrcdir)/, torture.o)
PUBLIC_HEADERS += lib/torture/torture.h
PUBLIC_HEADERS += $(libtorturesrcdir)/torture.h

View File

@ -4,7 +4,7 @@ PUBLIC_DEPENDENCIES = \
SOCKET_WRAPPER LIBREPLACE_NETWORK \
CHARSET EXECINFO
LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
xfile.o \
debug.o \
fault.o \
@ -25,7 +25,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
become_daemon.o \
params.o)
PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
attr.h \
byteorder.h \
data_blob.h \
@ -39,12 +39,12 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
[SUBSYSTEM::ASN1_UTIL]
PRIVATE_PROTO_HEADER = asn1_proto.h
ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
ASN1_UTIL_OBJ_FILES = $(libutilsrcdir)/asn1.o
[SUBSYSTEM::UNIX_PRIVS]
PRIVATE_PROTO_HEADER = unix_privs.h
UNIX_PRIVS_OBJ_FILES = lib/util/unix_privs.o
UNIX_PRIVS_OBJ_FILES = $(libutilsrcdir)/unix_privs.o
################################################
# Start SUBSYSTEM WRAP_XATTR
@ -54,15 +54,15 @@ PUBLIC_DEPENDENCIES = XATTR
# End SUBSYSTEM WRAP_XATTR
################################################
WRAP_XATTR_OBJ_FILES = lib/util/wrap_xattr.o
WRAP_XATTR_OBJ_FILES = $(libutilsrcdir)/wrap_xattr.o
[SUBSYSTEM::UTIL_TDB]
PRIVATE_PROTO_HEADER = util_tdb.h
PUBLIC_DEPENDENCIES = LIBTDB
UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o
UTIL_TDB_OBJ_FILES = $(libutilsrcdir)/util_tdb.o
[SUBSYSTEM::UTIL_LDB]
PUBLIC_DEPENDENCIES = LIBLDB
UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o
UTIL_LDB_OBJ_FILES = $(libutilsrcdir)/util_ldb.o

View File

@ -13,26 +13,46 @@ libnetsrcdir := libnet
mkinclude libnet/config.mk
authsrcdir := auth
mkinclude auth/config.mk
nsswitchsrcdir = nsswitch
nsswitchsrcdir := nsswitch
mkinclude nsswitch/config.mk
mkinclude lib/samba3/config.mk
libsocketsrcdir := lib/socket
mkinclude lib/socket/config.mk
libcharsetsrcdir := lib/charset
mkinclude lib/charset/config.mk
ldb_sambasrcdir := lib/ldb-samba
mkinclude lib/ldb-samba/config.mk
libtlssrcdir := lib/tls
mkinclude lib/tls/config.mk
libregistrysrcdir := lib/registry
mkinclude lib/registry/config.mk
libmessagingsrcdir := lib/messaging
mkinclude lib/messaging/config.mk
libeventssrcdir := lib/events
mkinclude lib/events/config.mk
libcmdlinesrcdir := lib/cmdline
mkinclude lib/cmdline/config.mk
socketwrappersrcdir := lib/socket_wrapper
mkinclude lib/socket_wrapper/config.mk
nsswrappersrcdir := lib/nss_wrapper
mkinclude lib/nss_wrapper/config.mk
appwebsrcdir := lib/appweb
mkinclude lib/appweb/config.mk
libstreamsrcdir := lib/stream
mkinclude lib/stream/config.mk
libutilsrcdir := lib/util
mkinclude lib/util/config.mk
libtdrsrcdir := lib/tdr
mkinclude lib/tdr/config.mk
libdbwrapsrcdir := lib/dbwrap
mkinclude lib/dbwrap/config.mk
libcryptosrcdir := lib/crypto
mkinclude lib/crypto/config.mk
libtorturesrcdir := lib/torture
mkinclude lib/torture/config.mk
libcompressionsrcdir := lib
libgencachesrcdir := lib
libsrcdir := lib
mkinclude lib/basic.mk
paramsrcdir := param
mkinclude param/config.mk