ctdb-build: Remove unnecessary intermediate build target
authorAmitay Isaacs <amitay@gmail.com>
Tue, 30 Aug 2016 07:27:47 +0000 (17:27 +1000)
committerAmitay Isaacs <amitay@samba.org>
Fri, 16 Dec 2016 07:42:32 +0000 (08:42 +0100)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/wscript

index 23134564e51a4152168c22846f00582dbf4fef61..00a475f75cd56d042d0a544efd158df20dfccecf 100644 (file)
@@ -434,8 +434,8 @@ def build(bld):
                         includes='include',
                         deps='ctdb-protocol replace talloc tevent')
 
-    bld.SAMBA_SUBSYSTEM('ctdb-server',
-                        source='server/ctdbd.c ' +
+    bld.SAMBA_BINARY('ctdbd',
+                     source='server/ctdbd.c ' +
                                bld.SUBDIR('server',
                                           '''ctdb_daemon.c ctdb_recoverd.c
                                              ctdb_recover.c ctdb_freeze.c
@@ -452,14 +452,10 @@ def build(bld):
                                              ctdb_statistics.c
                                              ctdb_update_record.c
                                              ctdb_lock.c ctdb_fork.c'''),
-                        includes='include',
-                        deps='''ctdb-ipalloc replace sys_rw
-                                popt talloc tevent tdb talloc_report''')
-
-    bld.SAMBA_BINARY('ctdbd',
-                     source='',
-                     deps='''ctdb-server ctdb-client ctdb-common
-                             ctdb-system ctdb-tcp ctdb-util''' +
+                     includes='include',
+                     deps='''ctdb-ipalloc ctdb-client ctdb-common ctdb-system
+                             ctdb-tcp ctdb-util replace sys_rw popt
+                             talloc tevent tdb talloc_report''' +
                           ib_deps,
                      install_path='${SBINDIR}',
                      manpages='ctdbd.1')