diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-21 23:57:59 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-21 23:57:59 +0200 |
| commit | bc794246df473b2e1a12694671afd51da14af5ad (patch) | |
| tree | a26b65519cf22b7763070d0f483f6dac5248ec20 /source4 | |
| parent | 89b23974d3efa3d8a1e97cf49c2f949d3fa52ffa (diff) | |
| download | samba-bc794246df473b2e1a12694671afd51da14af5ad.tar.gz samba-bc794246df473b2e1a12694671afd51da14af5ad.tar.bz2 samba-bc794246df473b2e1a12694671afd51da14af5ad.zip | |
Fix merged build.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/Makefile | 1 | ||||
| -rw-r--r-- | source4/lib/com/config.mk | 8 |
2 files changed, 5 insertions, 4 deletions
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 |