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/lib | |
| 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/lib')
| -rw-r--r-- | source4/lib/ldb/config.mk | 7 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 87e15f1375..f2c10638b0 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -123,6 +123,7 @@ REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC ################################################ # Start BINARY ldbadd [BINARY::ldbadd] +INSTALLDIR = BINDIR OBJ_FILES = \ lib/ldb/tools/ldbadd.o REQUIRED_SUBSYSTEMS = \ @@ -134,6 +135,7 @@ MANPAGE = lib/ldb/man/ldbadd.1 ################################################ # Start BINARY ldbdel [BINARY::ldbdel] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/ldb/tools/ldbdel.o REQUIRED_SUBSYSTEMS = \ @@ -145,6 +147,7 @@ MANPAGE = lib/ldb/man/ldbdel.1 ################################################ # Start BINARY ldbmodify [BINARY::ldbmodify] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/ldb/tools/ldbmodify.o REQUIRED_SUBSYSTEMS = \ @@ -156,6 +159,7 @@ MANPAGE = lib/ldb/man/ldbmodify.1 ################################################ # Start BINARY ldbsearch [BINARY::ldbsearch] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/ldb/tools/ldbsearch.o REQUIRED_SUBSYSTEMS = \ @@ -167,6 +171,7 @@ MANPAGE = lib/ldb/man/ldbsearch.1 ################################################ # Start BINARY ldbedit [BINARY::ldbedit] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/ldb/tools/ldbedit.o REQUIRED_SUBSYSTEMS = \ @@ -178,6 +183,7 @@ MANPAGE = lib/ldb/man/ldbedit.1 ################################################ # Start BINARY ldbrename [BINARY::ldbrename] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/ldb/tools/ldbrename.o REQUIRED_SUBSYSTEMS = \ @@ -189,6 +195,7 @@ MANPAGE = lib/ldb/man/ldbrename.1 ################################################ # Start BINARY ldbtest [BINARY::ldbtest] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/ldb/tools/ldbtest.o REQUIRED_SUBSYSTEMS = \ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index ab699a8ac0..c533e17ea9 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -94,6 +94,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start BINARY regdiff [BINARY::regdiff] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/registry/tools/regdiff.o REQUIRED_SUBSYSTEMS = \ @@ -105,6 +106,7 @@ MANPAGE = lib/registry/man/regdiff.1 ################################################ # Start BINARY regpatch [BINARY::regpatch] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/registry/tools/regpatch.o REQUIRED_SUBSYSTEMS = \ @@ -116,6 +118,7 @@ MANPAGE = lib/registry/man/regpatch.1 ################################################ # Start BINARY regshell [BINARY::regshell] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/registry/tools/regshell.o REQUIRED_SUBSYSTEMS = \ @@ -127,6 +130,7 @@ MANPAGE = lib/registry/man/regshell.1 ################################################ # Start BINARY regtree [BINARY::regtree] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/registry/tools/regtree.o REQUIRED_SUBSYSTEMS = \ diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 221c5284f7..60c41f8bb2 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -28,6 +28,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start BINARY tdbtool [BINARY::tdbtool] +INSTALLDIR = BINDIR ENABLE = NO OBJ_FILES= \ lib/tdb/tools/tdbtool.o @@ -39,6 +40,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start BINARY tdbtorture [BINARY::tdbtorture] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/tdb/tools/tdbtorture.o REQUIRED_SUBSYSTEMS = \ @@ -49,6 +51,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start BINARY tdbdump [BINARY::tdbdump] +INSTALLDIR = BINDIR OBJ_FILES= \ lib/tdb/tools/tdbdump.o REQUIRED_SUBSYSTEMS = \ @@ -59,6 +62,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start BINARY tdbbackup [BINARY::tdbbackup] +INSTALLDIR = BINDIR ENABLE = NO OBJ_FILES= \ lib/tdb/tools/tdbbackup.o |