From bd44f14d8f920a89b43ac84417365191a93d4aaf Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 27 Mar 2010 18:14:33 +1100 Subject: s4-waf: enable the pc_files in the build rules --- lib/torture/wscript_build | 2 +- source4/auth/gensec/wscript_build | 2 +- source4/dynconfig/wscript | 1 + source4/lib/ldb/wscript | 1 + source4/lib/registry/wscript_build | 2 +- source4/librpc/wscript_build | 8 ++++---- source4/param/wscript_build | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build index fe8becabff..fa5fd3b062 100644 --- a/lib/torture/wscript_build +++ b/lib/torture/wscript_build @@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('torture', source='torture.c subunit.c', vnum='0.0.1', - # PC_FILES='torture.pc', + pc_files='torture.pc', public_deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-ERRORS talloc tevent', public_headers='torture.h' ) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index b9fa5f4c49..fffc4045f7 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -1,6 +1,6 @@ bld.SAMBA_LIBRARY('gensec', source='gensec.c socket.c', - # PC_FILES='gensec.pc', + pc_files='gensec.pc', autoproto='gensec_proto.h', public_deps='CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT', public_headers='gensec.h', diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript index 3f609efa73..46a3040f80 100644 --- a/source4/dynconfig/wscript +++ b/source4/dynconfig/wscript @@ -30,6 +30,7 @@ dyn_cflags = { 'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}', 'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}', 'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}', + 'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig', } def get_varname(v): diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 3a54e55415..6ea68976f9 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -108,6 +108,7 @@ def build(bld): deps=ldb_deps, includes='include', public_headers='include/ldb.h include/ldb_errors.h', + pc_files='ldb.pc', vnum=VERSION) bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE', diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index cd2b508144..5c1f03057d 100644 --- a/source4/lib/registry/wscript_build +++ b/source4/lib/registry/wscript_build @@ -10,7 +10,7 @@ bld.SAMBA_SUBSYSTEM('TDR_REGF', bld.SAMBA_LIBRARY('registry', source='interface.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c', - # PC_FILES='registry.pc', + pc_files='registry.pc', public_deps='LIBSAMBA-UTIL CHARSET TDR_REGF ldb RPC_NDR_WINREG LDB_WRAP', public_headers='registry.h', vnum='0.0.1' diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index ad0ac19873..ab4398aaf3 100644 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -3,7 +3,7 @@ bld.BUILD_SUBDIR('idl') bld.SAMBA_LIBRARY('LIBNDR', source='ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c', - # PC_FILES='../librpc/ndr.pc', + pc_files='../../librpc/ndr.pc', public_deps='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET LIBSAMBA-HOSTCONFIG', public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h', header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ], @@ -327,7 +327,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP', bld.SAMBA_LIBRARY('NDR_STANDARD', source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/gen_ndr/ndr_lsa.c ../../librpc/gen_ndr/ndr_samr.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c', vnum='0.0.1', - # PC_FILES='../librpc/ndr_standard.pc', + pc_files='../../librpc/ndr_standard.pc', deps='NDR_SECURITY', public_deps='LIBNDR', public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h', @@ -430,7 +430,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_IRPC', bld.SAMBA_LIBRARY('dcerpc_samr', source='../../librpc/gen_ndr/ndr_samr_c.c', - # PC_FILES='dcerpc_samr.pc', + pc_files='dcerpc_samr.pc', vnum='0.0.1', public_deps='dcerpc NDR_STANDARD', public_headers='../../librpc/gen_ndr/ndr_samr_c.h', @@ -598,7 +598,7 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC', bld.SAMBA_LIBRARY('dcerpc', source='rpc/dcerpc.c rpc/dcerpc_auth.c rpc/dcerpc_schannel.c rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c rpc/dcerpc_connect.c rpc/dcerpc_secondary.c ../../librpc/rpc/binding.c ../../librpc/rpc/dcerpc_error.c', - # PC_FILES='dcerpc.pc', + pc_files='dcerpc.pc', deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT', autoproto='rpc/dcerpc_proto.h', public_deps='CREDENTIALS tevent talloc', diff --git a/source4/param/wscript_build b/source4/param/wscript_build index ea1bfc6e3e..1da3b475e1 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -1,6 +1,6 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG', source='loadparm.c generic.c util.c', - # PC_FILES='samba-hostconfig.pc', + pc_files='samba-hostconfig.pc', vnum='0.0.1', deps='DYNCONFIG LIBREPLACE_EXT CHARSET dl', public_deps='LIBSAMBA-UTIL', -- cgit