Rev 11595: Export mgmt, samr and atsvc for use in samba-gtk. in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Mon Feb 26 16:15:04 GMT 2007
At file:///home/jelmer/bzr.samba/SAMBA_4_0/
------------------------------------------------------------
revno: 11595
revision-id: jelmer at samba.org-20070226161456-f3ao5hpde0qf6jbr
parent: svn-v2:21539 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Mon 2007-02-26 17:14:56 +0100
message:
Export mgmt, samr and atsvc for use in samba-gtk.
modified:
source/build/smb_build/makefile.pm svn-v2:3690 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fbuild%2fsmb_build%2fmakefile.pm
source/libnet/config.mk svn-v2:1816 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibnet%2fconfig.mk
source/librpc/config.mk svn-v2:3433 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fconfig.mk
source/scripting/swig/config.mk svn-v2:14906 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscripting%2fswig%2fconfig.mk
source/torture/config.mk svn-v2:860 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fconfig.mk
source/winbind/config.mk svn-v2:4729 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fwinbind%2fconfig.mk
=== modified file 'source/build/smb_build/makefile.pm'
--- a/source/build/smb_build/makefile.pm 2007-01-22 00:04:59 +0000
+++ b/source/build/smb_build/makefile.pm 2007-02-26 16:14:56 +0000
@@ -71,8 +71,8 @@
prefix = $self->{config}->{prefix}
exec_prefix = $self->{config}->{exec_prefix}
selftest_prefix = $self->{config}->{selftest_prefix}
-VPATH = $self->{config}->{srcdir}:heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
srcdir = $self->{config}->{srcdir}
+VPATH = \$(srcdir):heimdal_build:heimdal/lib/asn1:heimdal/lib/krb5:heimdal/lib/gssapi:heimdal/lib/hdb:heimdal/lib/roken:heimdal/lib/des
builddir = $self->{config}->{builddir}
datarootdir = $self->{config}->{datarootdir}
@@ -85,10 +85,10 @@
INCLUDEDIR = $self->{config}->{includedir}
CONFIGDIR = $self->{config}->{sysconfdir}
DATADIR = $self->{config}->{datadir}
-WEBAPPSDIR = $self->{config}->{datadir}/webapps
-SERVICESDIR = $self->{config}->{datadir}/services
-JSDIR = $self->{config}->{datadir}/js
-SETUPDIR = $self->{config}->{datadir}/setup
+WEBAPPSDIR = \$(DATADIR)/webapps
+SERVICESDIR = \$(DATADIR)/services
+JSDIR = \$(DATADIR)/js
+SETUPDIR = \$(DATADIR)/setup
VARDIR = $self->{config}->{localstatedir}
LOGFILEBASE = $self->{config}->{logfilebase}
NCALRPCDIR = $self->{config}->{localstatedir}/ncalrpc
@@ -476,12 +476,17 @@
"includedir=$self->{config}->{includedir}"
]
);
+ my $abs_srcdir = abs_path($self->{config}->{srcdir});
smb_build::env::PkgConfig($self,
"bin/pkgconfig/$link_name-uninstalled.pc",
$link_name,
"-Lbin/shared -Lbin/static -l$link_name",
$privlibs,
- "-I. -Iinclude -Ilib -Ilib/replace",
+ join(' ',
+ "-I$abs_srcdir",
+ "-I$abs_srcdir/include",
+ "-I$abs_srcdir/lib",
+ "-I$abs_srcdir/lib/replace"),
"$ctx->{VERSION}",
$ctx->{DESCRIPTION},
defined($ctx->{INIT_FUNCTIONS}),
=== modified file 'source/libnet/config.mk'
--- a/source/libnet/config.mk 2006-12-05 11:49:55 +0000
+++ b/source/libnet/config.mk 2007-02-26 16:14:56 +0000
@@ -27,4 +27,4 @@
userinfo.o \
userman.o \
prereq_domain.o
-PUBLIC_DEPENDENCIES = dcerpc RPC_NDR_SAMR RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel
+PUBLIC_DEPENDENCIES = dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBSAMBA3 LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel
=== modified file 'source/librpc/config.mk'
--- a/source/librpc/config.mk 2007-02-18 18:44:56 +0000
+++ b/source/librpc/config.mk 2007-02-26 16:14:56 +0000
@@ -324,9 +324,12 @@
OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
-[SUBSYSTEM::RPC_NDR_SAMR]
+[LIBRARY::dcerpc_samr]
OBJ_FILES = gen_ndr/ndr_samr_c.o
PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - SAMR
[SUBSYSTEM::RPC_NDR_SPOOLSS]
OBJ_FILES = gen_ndr/ndr_spoolss_c.o
@@ -345,10 +348,13 @@
PUBLIC_HEADERS = gen_ndr/ndr_svcctl_c.h
PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
-[SUBSYSTEM::RPC_NDR_ATSVC]
+[LIBRARY::dcerpc_atsvc]
OBJ_FILES = gen_ndr/ndr_atsvc_c.o
PUBLIC_HEADERS = gen_ndr/ndr_atsvc_c.h
PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - ATSVC
[SUBSYSTEM::RPC_NDR_EVENTLOG]
OBJ_FILES = gen_ndr/ndr_eventlog_c.o
@@ -382,9 +388,12 @@
OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
-[SUBSYSTEM::RPC_NDR_MGMT]
+[LIBRARY::dcerpc_mgmt]
OBJ_FILES = gen_ndr/ndr_mgmt_c.o
PUBLIC_DEPENDENCIES = dcerpc NDR_MGMT
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - MGMT
[SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
=== modified file 'source/scripting/swig/config.mk'
--- a/source/scripting/swig/config.mk 2006-05-13 21:36:15 +0000
+++ b/source/scripting/swig/config.mk 2007-02-26 16:14:56 +0000
@@ -2,7 +2,7 @@
# Start LIBRARY swig_dcerpc
[LIBRARY::swig_dcerpc]
LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
OBJ_FILES = dcerpc_wrap.o
# End LIBRARY swig_dcerpc
#######################
=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk 2007-02-20 14:39:13 +0000
+++ b/source/torture/config.mk 2007-02-26 16:14:56 +0000
@@ -157,9 +157,9 @@
rpc/rpc.o \
rpc/async_bind.o
PUBLIC_DEPENDENCIES = \
- NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
+ NDR_TABLE RPC_NDR_UNIXINFO dcerpc_samr RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
- RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
+ dcerpc_mgmt RPC_NDR_NETLOGON dcerpc_atsvc RPC_NDR_DRSUAPI \
RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER WB_HELPER LIBSAMBA-NET \
=== modified file 'source/winbind/config.mk'
--- a/source/winbind/config.mk 2006-10-29 17:40:19 +0000
+++ b/source/winbind/config.mk 2007-02-26 16:14:56 +0000
@@ -30,7 +30,7 @@
NDR_WINBIND \
process_model \
RPC_NDR_LSA \
- RPC_NDR_SAMR \
+ dcerpc_samr \
PAM_ERRORS \
LIBCLI_LDAP
# End SUBSYSTEM WINBIND
@@ -42,6 +42,6 @@
PRIVATE_PROTO_HEADER = wb_helper.h
OBJ_FILES = \
wb_async_helpers.o
-PUBLIC_DEPENDENCIES = RPC_NDR_LSA RPC_NDR_SAMR
+PUBLIC_DEPENDENCIES = RPC_NDR_LSA dcerpc_samr
# End SUBSYSTEM WB_HELPER
################################################
More information about the samba-cvs
mailing list