git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1750bd4
)
s4-waf: enable the pc_files in the build rules
author
Andrew Tridgell
<tridge@samba.org>
Sat, 27 Mar 2010 07:14:33 +0000
(18:14 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Tue, 6 Apr 2010 10:27:10 +0000
(20:27 +1000)
lib/torture/wscript_build
patch
|
blob
|
history
source4/auth/gensec/wscript_build
patch
|
blob
|
history
source4/dynconfig/wscript
patch
|
blob
|
history
source4/lib/ldb/wscript
patch
|
blob
|
history
source4/lib/registry/wscript_build
patch
|
blob
|
history
source4/librpc/wscript_build
patch
|
blob
|
history
source4/param/wscript_build
patch
|
blob
|
history
diff --git
a/lib/torture/wscript_build
b/lib/torture/wscript_build
index fe8becabff9fd281183626796dc77456ef6aba02..fa5fd3b062ee3ac713c597a1e57636a5093c855e 100644
(file)
--- 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',
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'
)
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 b9fa5f4c4958c33266b36ea29b6ef1e7037e3560..fffc4045f725cd6373c06e338dfe140fb0f01788 100644
(file)
--- 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',
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',
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 3f609efa73fb1fbe3174541913e77b3bb28b303d..46a3040f80ff0550e850ad42b54d01533d3d9c5a 100644
(file)
--- 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}',
'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):
}
def get_varname(v):
diff --git
a/source4/lib/ldb/wscript
b/source4/lib/ldb/wscript
index 3a54e554154848cef833c3cc3354157f21c275a8..6ea68976f9efbe3d7b47eaade79676c5ba9a1c2d 100644
(file)
--- 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',
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',
vnum=VERSION)
bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
diff --git
a/source4/lib/registry/wscript_build
b/source4/lib/registry/wscript_build
index cd2b5081445979d48d1579ea4baa708df1c26c26..5c1f03057d76eeaf6c4e391ddccc0ecbc48d723b 100644
(file)
--- 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',
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'
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 ad0ac19873204b9933587fa9544c73aac1bcddc3..ab4398aaf3aa3819e1412b63304ec7a7526b0dca 100644
(file)
--- 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',
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' ) ],
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',
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',
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',
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',
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',
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',
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 ea1bfc6e3e5e42a0e793ffea38c79f6c32645db0..1da3b475e1e64647e1775a0cf374d7d3b741d577 100644
(file)
--- 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',
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',
vnum='0.0.1',
deps='DYNCONFIG LIBREPLACE_EXT CHARSET dl',
public_deps='LIBSAMBA-UTIL',