summaryrefslogtreecommitdiff
path: root/source4/librpc/config.mk
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-13 16:30:40 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-13 16:30:40 +0200
commit2ce72b5a69e3cf306277460a6d87754bf71c024b (patch)
tree667137b43d168d61831b4903d5bf74ef9f79d19f /source4/librpc/config.mk
parenteaba7784160be9dcf40f57c30c6f01a691082ba6 (diff)
parent345e731fc10b779204b699076876e89237da6cdb (diff)
downloadsamba-2ce72b5a69e3cf306277460a6d87754bf71c024b.tar.gz
samba-2ce72b5a69e3cf306277460a6d87754bf71c024b.tar.bz2
samba-2ce72b5a69e3cf306277460a6d87754bf71c024b.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/librpc/config.mk')
-rw-r--r--source4/librpc/config.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 05041e73da..9f1d5df96f 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -8,7 +8,7 @@ dcerpcsrcdir = $(librpcsrcdir)/rpc
PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
LIBSAMBA-HOSTCONFIG
-LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr.o ndr_basic.o ndr_string.o uuid.o)
+LIBNDR_OBJ_FILES = $(addprefix $(ndrsrcdir)/, ndr_string.o) ../librpc/ndr/ndr_basic.o ../librpc/ndr/uuid.o ../librpc/ndr/ndr.o
$(eval $(call proto_header_template,$(ndrsrcdir)/libndr_proto.h,$(LIBNDR_OBJ_FILES:.o=.c)))
@@ -36,9 +36,9 @@ PRIVATE_DEPENDENCIES = \
# End BINARY ndrdump
#################################
-ndrdump_OBJ_FILES = $(librpcsrcdir)/tools/ndrdump.o
+ndrdump_OBJ_FILES = ../librpc/tools/ndrdump.o
-MANPAGES += $(librpcsrcdir)/tools/ndrdump.1
+MANPAGES += ../librpc/tools/ndrdump.1
################################################
# Start SUBSYSTEM NDR_COMPRESSION
@@ -107,7 +107,7 @@ NDR_EFS_OBJ_FILES = $(gen_ndrsrcdir)/ndr_efs.o
[SUBSYSTEM::NDR_MISC]
PUBLIC_DEPENDENCIES = LIBNDR
-NDR_MISC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_misc.o $(ndrsrcdir)/ndr_misc.o
+NDR_MISC_OBJ_FILES = $(gen_ndrsrcdir)/ndr_misc.o ../librpc/ndr/ndr_misc.o
PUBLIC_HEADERS += $(gen_ndrsrcdir)/misc.h $(gen_ndrsrcdir)/ndr_misc.h