Move WMI support code to top-level.

diff --git a/source4/librpc/ndr/ndr_wmi.c b/librpc/ndr/ndr_wmi.c
similarity index 100%
rename from source4/librpc/ndr/ndr_wmi.c
rename to librpc/ndr/ndr_wmi.c

diff --git a/source4/librpc/ndr/ndr_wmi.h b/librpc/ndr/ndr_wmi.h
similarity index 100%
rename from source4/librpc/ndr/ndr_wmi.h
rename to librpc/ndr/ndr_wmi.h

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 6a0cd00e110675bb8e9bc35f1e5db8016ca587d6..02542cbfea845605ced27728b167ecfd3f1c40c7 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -10,8 +10,6 @@ PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
 
 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)))
-
 PC_FILES += ../librpc/ndr.pc
 LIBNDR_VERSION = 0.0.1
 LIBNDR_SOVERSION = 0
@@ -90,7 +88,7 @@ NDR_DCOM_OBJ_FILES = $(gen_ndrsrcdir)/ndr_dcom.o
 [SUBSYSTEM::NDR_WMI]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_DCOM
 
-NDR_WMI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wmi.o $(ndrsrcdir)/ndr_wmi.o
+NDR_WMI_OBJ_FILES = $(gen_ndrsrcdir)/ndr_wmi.o ../librpc/ndr/ndr_wmi.o
 
 [SUBSYSTEM::NDR_DSBACKUP]
 PUBLIC_DEPENDENCIES = LIBNDR