diff options
-rw-r--r-- | source4/auth/config.mk | 6 | ||||
-rw-r--r-- | source4/auth/credentials/config.mk | 2 | ||||
-rw-r--r-- | source4/auth/gensec/config.mk | 2 | ||||
-rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
-rw-r--r-- | source4/dsdb/config.mk | 6 | ||||
-rw-r--r-- | source4/lib/charset/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/tdr/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/util/config.mk | 8 | ||||
-rw-r--r-- | source4/libcli/config.mk | 2 | ||||
-rw-r--r-- | source4/libcli/ldap/config.mk | 4 | ||||
-rw-r--r-- | source4/librpc/config.mk | 4 | ||||
-rw-r--r-- | source4/param/config.mk | 4 | ||||
-rw-r--r-- | source4/rpc_server/config.mk | 4 | ||||
-rw-r--r-- | source4/torture/config.mk | 2 |
14 files changed, 24 insertions, 26 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 5b320bcf36..4263a10df7 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -7,12 +7,12 @@ mkinclude credentials/config.mk [SUBSYSTEM::auth_session] OBJ_FILES = session.o PUBLIC_HEADERS = session.h -PUBLIC_PROTO_HEADER = session_proto.h +PRIVATE_PROTO_HEADER = session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS [SUBSYSTEM::auth_system_session] OBJ_FILES = system_session.o -PUBLIC_PROTO_HEADER = system_session_proto.h +PRIVATE_PROTO_HEADER = system_session_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY @@ -82,7 +82,7 @@ OBJ_FILES = pam_errors.o #VERSION = 0.0.1 #SO_VERSION = 0 PUBLIC_HEADERS = auth.h -PUBLIC_PROTO_HEADER = auth_proto.h +PRIVATE_PROTO_HEADER = auth_proto.h OBJ_FILES = \ auth.o \ auth_util.o \ diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index fee9519ae5..a81a5184f6 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -1,7 +1,7 @@ ################################# # Start SUBSYSTEM CREDENTIALS [SUBSYSTEM::CREDENTIALS] -PUBLIC_PROTO_HEADER = credentials_proto.h +PRIVATE_PROTO_HEADER = credentials_proto.h PUBLIC_HEADERS = credentials.h credentials_krb5.h OBJ_FILES = credentials.o \ credentials_files.o \ diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index 9aab2c704e..814ffbc1c0 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -5,7 +5,7 @@ PC_FILE = gensec.pc VERSION = 0.0.1 SO_VERSION = 0 PUBLIC_HEADERS = gensec.h spnego.h -PUBLIC_PROTO_HEADER = gensec_proto.h +PRIVATE_PROTO_HEADER = gensec_proto.h OBJ_FILES = gensec.o socket.o PUBLIC_DEPENDENCIES = \ CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 70520554ab..bb8a5f9650 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -38,7 +38,6 @@ my $section_types = { "MANPAGE" => "string", - "PUBLIC_PROTO_HEADER" => "string", "PRIVATE_PROTO_HEADER" => "string", "PUBLIC_HEADERS" => "list", @@ -106,7 +105,6 @@ my $section_types = { "PUBLIC_HEADERS" => "list", - "PUBLIC_PROTO_HEADER" => "string", "PRIVATE_PROTO_HEADER" => "string", "CFLAGS" => "list", diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk index 17752fbbbd..bd5d92c652 100644 --- a/source4/dsdb/config.mk +++ b/source4/dsdb/config.mk @@ -5,7 +5,7 @@ mkinclude samdb/ldb_modules/config.mk ################################################ # Start SUBSYSTEM SAMDB [SUBSYSTEM::SAMDB] -PUBLIC_PROTO_HEADER = samdb/samdb_proto.h +PRIVATE_PROTO_HEADER = samdb/samdb_proto.h PUBLIC_HEADERS = samdb/samdb.h PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \ @@ -18,7 +18,7 @@ OBJ_FILES = \ repl/replicated_objects.o [SUBSYSTEM::SAMDB_COMMON] -PUBLIC_PROTO_HEADER = common/proto.h +PRIVATE_PROTO_HEADER = common/proto.h PRIVATE_DEPENDENCIES = LIBLDB OBJ_FILES = \ common/sidmap.o \ @@ -26,7 +26,7 @@ OBJ_FILES = \ common/util.o [SUBSYSTEM::SAMDB_SCHEMA] -PUBLIC_PROTO_HEADER = schema/proto.h +PRIVATE_PROTO_HEADER = schema/proto.h PUBLIC_HEADERS = schema/schema.h PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS OBJ_FILES = \ diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 4f0c80c79d..2dd5b05c94 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -6,7 +6,7 @@ OBJ_FILES = \ charcnv.o \ util_unistr.o PUBLIC_HEADERS = charset.h -PUBLIC_PROTO_HEADER = charset_proto.h +PRIVATE_PROTO_HEADER = charset_proto.h PUBLIC_DEPENDENCIES = ICONV PRIVATE_DEPENDENCIES = DYNCONFIG # End SUBSYSTEM CHARSET diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk index b8473e5ba8..2d6c30ea50 100644 --- a/source4/lib/tdr/config.mk +++ b/source4/lib/tdr/config.mk @@ -1,6 +1,6 @@ [SUBSYSTEM::TDR] CFLAGS = -Ilib/tdr PUBLIC_HEADERS = tdr.h -PUBLIC_PROTO_HEADER = tdr_proto.h +PRIVATE_PROTO_HEADER = tdr_proto.h PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL OBJ_FILES = tdr.o diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index f3e6cd7acf..6a19515708 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -34,7 +34,7 @@ PUBLIC_DEPENDENCIES = \ CHARSET EXECINFO [SUBSYSTEM::ASN1_UTIL] -PUBLIC_PROTO_HEADER = asn1_proto.h +PRIVATE_PROTO_HEADER = asn1_proto.h PUBLIC_HEADERS = asn1.h OBJ_FILES = asn1.o @@ -45,7 +45,7 @@ OBJ_FILES = unix_privs.o ################################################ # Start SUBSYSTEM WRAP_XATTR [SUBSYSTEM::WRAP_XATTR] -PUBLIC_PROTO_HEADER = wrap_xattr.h +PRIVATE_PROTO_HEADER = wrap_xattr.h OBJ_FILES = \ wrap_xattr.o PUBLIC_DEPENDENCIES = XATTR @@ -54,13 +54,13 @@ PUBLIC_DEPENDENCIES = XATTR ################################################ [SUBSYSTEM::UTIL_TDB] -PUBLIC_PROTO_HEADER = util_tdb.h +PRIVATE_PROTO_HEADER = util_tdb.h OBJ_FILES = \ util_tdb.o PUBLIC_DEPENDENCIES = LIBTDB [SUBSYSTEM::UTIL_LDB] -PUBLIC_PROTO_HEADER = util_ldb.h +PRIVATE_PROTO_HEADER = util_ldb.h OBJ_FILES = \ util_ldb.o PUBLIC_DEPENDENCIES = LIBLDB diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index e4b6c71c8c..4771b947d5 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -103,7 +103,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING [SUBSYSTEM::LIBCLI_SMB] PUBLIC_HEADERS = libcli.h -PUBLIC_PROTO_HEADER = libcli_proto.h +PRIVATE_PROTO_HEADER = libcli_proto.h OBJ_FILES = clireadwrite.o \ cliconnect.o \ clifile.o \ diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk index 239ee1f161..15e5304a09 100644 --- a/source4/libcli/ldap/config.mk +++ b/source4/libcli/ldap/config.mk @@ -1,5 +1,5 @@ [SUBSYSTEM::LIBCLI_LDAP] -PUBLIC_PROTO_HEADER = ldap_proto.h +PRIVATE_PROTO_HEADER = ldap_proto.h PUBLIC_HEADERS = ldap.h OBJ_FILES = ldap.o \ ldap_client.o \ @@ -13,6 +13,6 @@ PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket NDR_SAMR LIBTLS ASN1_UTIL \ [SUBSYSTEM::LDAP_ENCODE] -PUBLIC_PROTO_HEADER = ldap_ndr.h +PRIVATE_PROTO_HEADER = ldap_ndr.h OBJ_FILES = ldap_ndr.o # FIXME PRIVATE_DEPENDENCIES = LIBLDB diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index d7a83374e1..a653dbeca5 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -5,7 +5,7 @@ VERSION = 0.0.1 SO_VERSION = 0 PC_FILE = ndr.pc PUBLIC_HEADERS = ndr/libndr.h -PUBLIC_PROTO_HEADER = ndr/libndr_proto.h +PRIVATE_PROTO_HEADER = ndr/libndr_proto.h OBJ_FILES = \ ndr/ndr.o \ ndr/ndr_basic.o \ @@ -462,7 +462,7 @@ PC_FILE = dcerpc.pc PUBLIC_HEADERS = rpc/dcerpc.h \ gen_ndr/mgmt.h gen_ndr/ndr_mgmt.h gen_ndr/ndr_mgmt_c.h \ gen_ndr/epmapper.h gen_ndr/ndr_epmapper.h gen_ndr/ndr_epmapper_c.h -PUBLIC_PROTO_HEADER = rpc/dcerpc_proto.h +PRIVATE_PROTO_HEADER = rpc/dcerpc_proto.h OBJ_FILES = \ rpc/dcerpc.o \ rpc/dcerpc_auth.o \ diff --git a/source4/param/config.mk b/source4/param/config.mk index c3f50b13fe..505e2f0af8 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -6,14 +6,14 @@ OBJ_FILES = loadparm.o \ ../lib/version.o PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET -PUBLIC_PROTO_HEADER = proto.h +PRIVATE_PROTO_HEADER = proto.h PUBLIC_HEADERS = param.h ################################# # Start SUBSYSTEM share [SUBSYSTEM::share] PUBLIC_HEADERS = share.h -PUBLIC_PROTO_HEADER = share_proto.h +PRIVATE_PROTO_HEADER = share_proto.h OBJ_FILES = share.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL # End SUBSYSTEM share diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk index 0032a867d1..3433cc162f 100644 --- a/source4/rpc_server/config.mk +++ b/source4/rpc_server/config.mk @@ -3,7 +3,7 @@ ################################################ # Start SUBSYSTEM DCERPC_COMMON [SUBSYSTEM::DCERPC_COMMON] -PUBLIC_PROTO_HEADER = common/proto.h +PRIVATE_PROTO_HEADER = common/proto.h PUBLIC_HEADERS = common/common.h OBJ_FILES = \ common/server_info.o \ @@ -184,7 +184,7 @@ PRIVATE_DEPENDENCIES = \ # Start SUBSYSTEM dcerpc_server [SUBSYSTEM::dcerpc_server] PUBLIC_HEADERS = dcerpc_server.h -PUBLIC_PROTO_HEADER = dcerpc_server_proto.h +PRIVATE_PROTO_HEADER = dcerpc_server_proto.h OBJ_FILES = \ dcerpc_server.o \ dcesrv_auth.o \ diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 626349a45d..8dc13e3f8b 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -4,7 +4,7 @@ SO_VERSION = 0 VERSION = 0.0.1 PC_FILE = torture.pc PUBLIC_HEADERS = torture.h ui.h -PUBLIC_PROTO_HEADER = proto.h +PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ torture.o \ ui.o |