ctdb-build: Do not mark ctdb private headers public

These headers are used by the server code and should not be marked public.
Samba builds against the in-tree version of the headers and should not
be built with externally installed CTDB.

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

diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index bc5ec0c3b00b726622422d20314ec0915425548e..d9d4125093ad90bdc45f0020bd60b7aaa54da0e3 100644 (file)
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -225,12 +225,6 @@ development libraries for ctdb
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/ctdb.h
-%{_includedir}/ctdb_client.h
-%{_includedir}/ctdb_protocol.h
-%{_includedir}/ctdb_private.h
-%{_includedir}/ctdb_typesafe_cb.h
-%{_includedir}/ctdb_version.h
 
 %package tests
 Summary: CTDB test suite

diff --git a/ctdb/wscript b/ctdb/wscript
index eea25e93be8a94d5740fd0afce16803c852934b3..d815cd9d1ebcde39fa30bbb4492d4dc167f65878 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -334,7 +334,6 @@ def build(bld):
     bld.SAMBA_SUBSYSTEM('ctdb-client',
                         source=bld.SUBDIR('client', 'ctdb_client.c'),
                         includes='include include/internal',
-                        public_headers='include/ctdb_client.h',
                         deps='''replace popt talloc tevent tdb
                                 samba-util tdb-wrap''')
 
@@ -358,11 +357,6 @@ def build(bld):
                                              ctdb_update_record.c
                                              ctdb_lock.c'''),
                         includes='include include/internal',
-                        public_headers='''include/ctdb_version.h
-                                          include/ctdb.h
-                                          include/ctdb_private.h
-                                          include/ctdb_protocol.h
-                                          include/ctdb_typesafe_cb.h''',
                         deps='replace popt talloc tevent tdb talloc_report')
 
     bld.SAMBA_BINARY('ctdbd',