ctdb-build: Drop lib/util from includes
authorMartin Schwenke <martin@meltin.net>
Tue, 19 Aug 2014 03:27:33 +0000 (13:27 +1000)
committerAmitay Isaacs <amitay@samba.org>
Tue, 9 Sep 2014 23:36:15 +0000 (01:36 +0200)
In is unnecessary and can accidentally cause lib/util/time.h to be
found instead of /usr/include/time.h.  The only things depending on it
were bare includes of db_wrap.h and a bare include of dlinklist.h,
which are both gone now.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/wscript

index 3570b009ab59420c3e871d90de7e6ef5f6904686..be8e4a720c4c1105df2d7debc1720c5f964045b7 100755 (executable)
@@ -208,7 +208,7 @@ def build(bld):
                                           '''ctdb_io.c ctdb_util.c ctdb_ltdb.c
                                              ctdb_message.c cmdline.c rb_tree.c
                                              system_common.c ctdb_fork.c'''),
-                        includes='include include/internal common . lib/util',
+                        includes='include include/internal common .',
                         deps='replace popt talloc tevent tdb popt')
 
     bld.SAMBA_SUBSYSTEM('ctdb-common-util',
@@ -237,7 +237,7 @@ def build(bld):
 
     bld.SAMBA_SUBSYSTEM('ctdb-client',
                         source=bld.SUBDIR('client', 'ctdb_client.c'),
-                        includes='include include/internal lib/util',
+                        includes='include include/internal',
                         public_headers='include/ctdb_client.h',
                         deps='''replace popt talloc tevent tdb
                                 ctdb-util tdb-wrap''')
@@ -258,7 +258,7 @@ def build(bld):
                                              ctdb_statistics.c
                                              ctdb_update_record.c
                                              ctdb_lock.c'''),
-                        includes='include include/internal lib/util',
+                        includes='include include/internal',
                         public_headers='''include/ctdb.h
                                           include/ctdb_private.h
                                           include/ctdb_protocol.h