Move PC_FILE out of the perl code.

(This used to be commit ca8d4260ada9f74ebc406714ca70d20be09b194b)

7 files changed, 10 insertions, 12 deletions

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 9b6417e688..243725b235 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -1,13 +1,13 @@
 #################################
 # Start SUBSYSTEM gensec
 [LIBRARY::gensec]
-PC_FILE = gensec.pc
 PRIVATE_PROTO_HEADER = gensec_proto.h
 PUBLIC_DEPENDENCIES = \
 		CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
 # End SUBSYSTEM gensec
 #################################
 
+PC_FILES += auth/gensec/gensec.pc
 
 gensec_VERSION = 0.0.1
 gensec_SOVERSION = 0
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index c5e0ac5a74..ce483d6cfa 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -77,8 +77,6 @@ my $section_types = {
 		"SO_VERSION"		=> "string",
 		"LIBRARY_REALNAME" => "string",
 
-		"PC_FILE" => "string",
-		
 		"INIT_FUNCTION_TYPE"	=> "string",
 		"INIT_FUNCTION_SENTINEL" => "string",
 		"OUTPUT_TYPE"		=> "list",
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index cb7bf7439e..a6abee6106 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -52,9 +52,6 @@ foreach my $key (values %$OUTPUT) {
 
 	$mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
-	if (defined($key->{PC_FILE})) {
-		$mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n");
-	} 
 	$mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
 					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	if ($key->{TYPE} eq "LIBRARY" and 
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 02763f08a5..23e2ef71dd 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -120,12 +120,13 @@ ldb_tdb_OBJ_FILES = $(addprefix lib/ldb/ldb_tdb/, ldb_tdb.o ldb_search.o ldb_pac
 # Start SUBSYSTEM ldb
 [LIBRARY::LIBLDB]
 CFLAGS = -Ilib/ldb/include
-PC_FILE = ldb.pc
 INIT_FUNCTION_TYPE = extern const struct ldb_module_ops
 PUBLIC_DEPENDENCIES = \
 		LIBTALLOC
 PRIVATE_DEPENDENCIES = \
 		SOCKET_WRAPPER
+
+PC_FILES += $(ldbdir)/ldb.pc
 #
 # End SUBSYSTEM ldb
 ################################################
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 72882bca93..16e9c62c57 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -18,13 +18,14 @@ clean::
 ################################################
 # Start SUBSYSTEM registry
 [LIBRARY::registry]
-PC_FILE = registry.pc
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
 		RPC_NDR_WINREG LDB_WRAP
 # End MODULE registry_ldb
 ################################################
 
+PC_FILES += lib/registry/registry.pc
+
 registry_VERSION = 0.0.1
 registry_SOVERSION = 0
 
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 7a88b83f34..682a3b81cd 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -1,13 +1,13 @@
 ################################################
 # Start SUBSYSTEM LIBNDR
 [LIBRARY::LIBNDR]
-PC_FILE = ndr.pc
 PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET EXT_NSL \
 					  LIBSAMBA-CONFIG
 
 LIBNDR_OBJ_FILES = $(addprefix librpc/ndr/, ndr.o ndr_basic.o ndr_string.o uuid.o)
 
+PC_FILES += librpc/ndr.pc
 LIBNDR_VERSION = 0.0.1
 LIBNDR_SOVERSION = 0
 
@@ -427,9 +427,10 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
 RPC_NDR_UNIXINFO_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo_c.o
 
 [LIBRARY::dcerpc_samr]
-PC_FILE = dcerpc_samr.pc
 PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR 
 
+PC_FILES += librpc/dcerpc_samr.pc
+
 dcerpc_samr_VERSION = 0.0.1
 dcerpc_samr_SOVERSION = 0
 dcerpc_samr_OBJ_FILES = librpc/gen_ndr/ndr_samr_c.o
@@ -568,7 +569,6 @@ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h)
 ################################################
 # Start SUBSYSTEM dcerpc
 [LIBRARY::dcerpc]
-PC_FILE = dcerpc.pc
 PRIVATE_PROTO_HEADER = rpc/dcerpc_proto.h
 PRIVATE_DEPENDENCIES = \
 		samba-socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 \
@@ -580,6 +580,7 @@ PUBLIC_DEPENDENCIES = CREDENTIALS
 # End SUBSYSTEM dcerpc
 ################################################
 
+PC_FILES += librpc/dcerpc.pc
 dcerpc_VERSION = 0.0.1
 dcerpc_SOVERSION = 0
 
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 5dee15a9d0..8c61771e9b 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -1,6 +1,5 @@
 # TORTURE subsystem
 [LIBRARY::torture]
-PC_FILE = torture.pc
 PRIVATE_PROTO_HEADER = proto.h
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-CONFIG \
@@ -8,6 +7,7 @@ PUBLIC_DEPENDENCIES = \
 		LIBTALLOC \
 		LIBPOPT
 
+PC_FILES += torture/torture.pc
 torture_OBJ_FILES = $(addprefix torture/, torture.o ui.o)
 
 PUBLIC_HEADERS += torture/torture.h torture/ui.h