diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-08-03 00:08:28 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:31:00 -0500 |
commit | 9f611ffddeced5661b81fbe6264502a0d59f187b (patch) | |
tree | 4ae28ccaa873c0c9f1d15e95e059ad4cbb931085 /source4/utils | |
parent | 7fe83f23b8184975c6179b6ea54db912972adf5f (diff) | |
download | samba-9f611ffddeced5661b81fbe6264502a0d59f187b.tar.gz samba-9f611ffddeced5661b81fbe6264502a0d59f187b.tar.bz2 samba-9f611ffddeced5661b81fbe6264502a0d59f187b.zip |
r8966: Simplify the makefile generation system a bit.
Autogenerate list of binaries (rather then having them hardcoded in build/smb_build/makefile.pm)
Add INSTALLDIR keyword to .mk files
(This used to be commit ce0935112b846486cf705ec69f12350be9c4c89d)
Diffstat (limited to 'source4/utils')
-rw-r--r-- | source4/utils/config.mk | 6 | ||||
-rw-r--r-- | source4/utils/net/config.mk | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/source4/utils/config.mk b/source4/utils/config.mk index 1af174e94e..c0a38076ae 100644 --- a/source4/utils/config.mk +++ b/source4/utils/config.mk @@ -3,6 +3,7 @@ ################################# # Start BINARY ndrdump [BINARY::ndrdump] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/ndrdump.o REQUIRED_SUBSYSTEMS = \ @@ -19,6 +20,7 @@ MANPAGE = utils/man/ndrdump.1 ################################# # Start BINARY ntlm_auth [BINARY::ntlm_auth] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/ntlm_auth.o REQUIRED_SUBSYSTEMS = \ @@ -34,6 +36,7 @@ MANPAGE = utils/man/ntlm_auth.1 ################################# # Start BINARY getntacl [BINARY::getntacl] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/getntacl.o REQUIRED_SUBSYSTEMS = \ @@ -48,6 +51,7 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start BINARY setntacl [BINARY::setntacl] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/setntacl.o REQUIRED_SUBSYSTEMS = \ @@ -61,6 +65,7 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start BINARY setnttoken [BINARY::setnttoken] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/setnttoken.o REQUIRED_SUBSYSTEMS = \ @@ -76,6 +81,7 @@ REQUIRED_SUBSYSTEMS = \ ################################# # Start BINARY nmblookup [BINARY::nmblookup] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/nmblookup.o REQUIRED_SUBSYSTEMS = \ diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk index f68cf68c8c..2f455d381f 100644 --- a/source4/utils/net/config.mk +++ b/source4/utils/net/config.mk @@ -3,6 +3,7 @@ ################################# # Start BINARY net [BINARY::net] +INSTALLDIR = BINDIR OBJ_FILES = \ utils/net/net.o \ utils/net/net_password.o \ |