diff options
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 17 | ||||
| -rw-r--r-- | source4/libnet/config.mk | 2 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 15 | ||||
| -rw-r--r-- | source4/scripting/swig/config.mk | 2 | ||||
| -rw-r--r-- | source4/torture/config.mk | 4 | ||||
| -rw-r--r-- | source4/winbind/config.mk | 4 |
6 files changed, 29 insertions, 15 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 9f571396eb..f72101a763 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -71,8 +71,8 @@ sub _prepare_path_vars($) 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 @@ MODULESDIR = $self->{config}->{modulesdir} 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 @@ sub PkgConfig($$$) "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}), diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk index 77b3876375..0d3ee6eb02 100644 --- a/source4/libnet/config.mk +++ b/source4/libnet/config.mk @@ -27,4 +27,4 @@ OBJ_FILES = \ 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 diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index c1a9d209b6..6f85d350e7 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -324,9 +324,12 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_POLICYAGENT 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 @@ OBJ_FILES = gen_ndr/ndr_svcctl_c.o 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 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG 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 diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk index 970c6ed71a..38c7afadd5 100644 --- a/source4/scripting/swig/config.mk +++ b/source4/scripting/swig/config.mk @@ -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 ####################### diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 8233266298..154a892cea 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -157,9 +157,9 @@ OBJ_FILES = \ 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 \ diff --git a/source4/winbind/config.mk b/source4/winbind/config.mk index 6b63e090ee..4acfd9ddb9 100644 --- a/source4/winbind/config.mk +++ b/source4/winbind/config.mk @@ -30,7 +30,7 @@ PUBLIC_DEPENDENCIES = \ NDR_WINBIND \ process_model \ RPC_NDR_LSA \ - RPC_NDR_SAMR \ + dcerpc_samr \ PAM_ERRORS \ LIBCLI_LDAP # End SUBSYSTEM WINBIND @@ -42,6 +42,6 @@ PUBLIC_DEPENDENCIES = \ 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 ################################################ |