diff options
| author | Günther Deschner <gd@samba.org> | 2008-09-24 02:25:34 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-09-24 03:30:50 +0200 |
| commit | 1ea185a340993653650230c293ca5139ac225d30 (patch) | |
| tree | 50dfa0087f1d1c845eac5f880a00838d8d91e00e | |
| parent | 765e5d2282959770ea9648e0f2b72e51e5b4cdd8 (diff) | |
| download | samba-1ea185a340993653650230c293ca5139ac225d30.tar.gz samba-1ea185a340993653650230c293ca5139ac225d30.tar.bz2 samba-1ea185a340993653650230c293ca5139ac225d30.zip | |
s3: fix merged_build.
Guenther
| -rw-r--r-- | source3/samba4.mk | 1 | ||||
| -rw-r--r-- | source4/Makefile | 1 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 12 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source3/samba4.mk b/source3/samba4.mk index 2646b12a0d..28bdf029f8 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -107,6 +107,7 @@ ntvfssrcdir := $(samba4srcdir)/ntvfs ntptrsrcdir := $(samba4srcdir)/ntptr clientsrcdir := $(samba4srcdir)/client libclisrcdir := $(samba4srcdir)/libcli +libclinbtsrcdir := $(samba4srcdir)/../libcli pyscriptsrcdir := $(samba4srcdir)/scripting/python kdcsrcdir := $(samba4srcdir)/kdc smbreadlinesrcdir := $(samba4srcdir)/lib/smbreadline diff --git a/source4/Makefile b/source4/Makefile index 2a267c3e7b..11057ae5f3 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -97,6 +97,7 @@ ntvfssrcdir := ntvfs ntptrsrcdir := ntptr librpcsrcdir := librpc libclisrcdir := libcli +libclinbtsrcdir := ../libcli pyscriptsrcdir := $(srcdir)/scripting/python kdcsrcdir := kdc ntp_signdsrcdir := ntp_signd diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 1a7dcdeec1..2f81d7cff0 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -40,15 +40,15 @@ $(eval $(call proto_header_template,$(libclisrcdir)/smb_composite/proto.h,$(LIBC [SUBSYSTEM::NDR_NBT_BUF] -NDR_NBT_BUF_OBJ_FILES = ../$(libclisrcdir)/nbt/nbtname.o +NDR_NBT_BUF_OBJ_FILES = $(libclinbtsrcdir)/nbt/nbtname.o -$(eval $(call proto_header_template,../$(libclisrcdir)/nbt/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c))) +$(eval $(call proto_header_template,$(libclinbtsrcdir)/nbt/nbtname.h,$(NDR_NBT_BUF_OBJ_FILES:.o=.c))) [SUBSYSTEM::LIBCLI_NBT] PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \ NDR_SECURITY samba-socket LIBSAMBA-UTIL -LIBCLI_NBT_OBJ_FILES = $(addprefix ../$(libclisrcdir)/nbt/, \ +LIBCLI_NBT_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/nbt/, \ nbtsocket.o \ namequery.o \ nameregister.o \ @@ -59,12 +59,12 @@ LIBCLI_NBT_OBJ_FILES = $(addprefix ../$(libclisrcdir)/nbt/, \ PUBLIC_DEPENDENCIES = LIBNDR \ NDR_SECURITY -LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix ../$(libclisrcdir)/, ndr_netlogon.o) +LIBCLI_NDR_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, ndr_netlogon.o) [SUBSYSTEM::LIBCLI_NETLOGON] PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL LIBCLI_NDR_NETLOGON -LIBCLI_NETLOGON_OBJ_FILES = $(addprefix ../$(libclisrcdir)/, \ +LIBCLI_NETLOGON_OBJ_FILES = $(addprefix $(libclinbtsrcdir)/, \ netlogon.o) [SUBSYSTEM::LIBCLI_DRSBLOBS] @@ -79,7 +79,7 @@ $(eval $(call proto_header_template,$(libclisrcdir)/drsblobs_proto.h,$(LIBCLI_DR LIBRARY_REALNAME = samba/netbios.$(SHLIBEXT) PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG -python_netbios_OBJ_FILES = ../$(libclisrcdir)/nbt/pynbt.o +python_netbios_OBJ_FILES = $(libclinbtsrcdir)/nbt/pynbt.o $(python_libcli_nbt_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) |