diff options
| -rw-r--r-- | source3/samba4.mk | 5 | ||||
| -rw-r--r-- | source4/Makefile | 1 | ||||
| -rw-r--r-- | source4/lib/com/config.mk | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index 294eef8b8f..2646b12a0d 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -7,7 +7,7 @@ PARTLINK = $(PROG_LD) -r MDLD = $(SHLD) MDLD_FLAGS = $(LDSHFLAGS) -samba4srcdir = $(call abspath,$(srcdir)/../source4) +samba4srcdir = $(srcdir)/../source4 # Flags used for the samba 4 files # $(srcdir)/include is required for config.h @@ -83,7 +83,6 @@ libcmdlinesrcdir := $(samba4srcdir)/lib/cmdline poptsrcdir := $(samba4srcdir)/../lib/popt socketwrappersrcdir := $(samba4srcdir)/../lib/socket_wrapper nsswrappersrcdir := $(samba4srcdir)/../lib/nss_wrapper -appwebsrcdir := $(samba4srcdir)/lib/appweb libstreamsrcdir := $(samba4srcdir)/lib/stream libutilsrcdir := $(samba4srcdir)/lib/util libtdrsrcdir := $(samba4srcdir)/lib/tdr @@ -108,7 +107,6 @@ ntvfssrcdir := $(samba4srcdir)/ntvfs ntptrsrcdir := $(samba4srcdir)/ntptr clientsrcdir := $(samba4srcdir)/client libclisrcdir := $(samba4srcdir)/libcli -ejsscriptsrcdir := $(samba4srcdir)/scripting/ejs pyscriptsrcdir := $(samba4srcdir)/scripting/python kdcsrcdir := $(samba4srcdir)/kdc smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline @@ -116,6 +114,7 @@ ntp_signdsrcdir := $(samba4srcdir)/ntp_signd tdbsrcdir := $(samba4srcdir)/../lib/tdb ldbsrcdir := $(samba4srcdir)/lib/ldb tallocsrcdir := $(samba4srcdir)/../lib/talloc +comsrcdir := $(samba4srcdir)/lib/com override ASN1C = bin/asn1_compile4 override ET_COMPILER = bin/compile_et4 include samba4-data.mk diff --git a/source4/Makefile b/source4/Makefile index bc470742c6..2a267c3e7b 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -102,6 +102,7 @@ kdcsrcdir := kdc ntp_signdsrcdir := ntp_signd wmisrcdir := lib/wmi tallocsrcdir := ../lib/talloc +comsrcdir := $(srcdir)/lib/com include data.mk diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index c5c5a35003..73836ef5f8 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,22 +1,22 @@ [SUBSYSTEM::COM] PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR -COM_OBJ_FILES = $(addprefix lib/com/, tables.o rot.o main.o) +COM_OBJ_FILES = $(addprefix $(comsrcdir)/, tables.o rot.o main.o) [SUBSYSTEM::DCOM] PUBLIC_DEPENDENCIES = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER -DCOM_OBJ_FILES = $(addprefix lib/com/dcom/, main.o tables.o) +DCOM_OBJ_FILES = $(addprefix $(comsrcdir)/dcom/, main.o tables.o) [MODULE::com_simple] SUBSYSTEM = COM INIT_FUNCTION = com_simple_init -com_simple_OBJ_FILES = lib/com/classes/simple.o +com_simple_OBJ_FILES = $(comsrcdir)/classes/simple.o [PYTHON::pycom] LIBRARY_REALNAME = samba/com.$(SHLIBEXT) PRIVATE_DEPENDENCIES = COM -pycom_OBJ_FILES = lib/com/pycom.o +pycom_OBJ_FILES = $(comsrcdir)/pycom.o |