summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-06-03 10:25:32 +0200
committerGünther Deschner <gd@samba.org>2010-06-03 11:00:27 +0200
commit4b342b73a6706eb6ce4b7e20d273b53583a64358 (patch)
treebd7ec61017282327162141d76c7f56a993d39fd9 /source3
parent84a8f0451d618ad05d451714f309ed3ab4acf57e (diff)
downloadsamba-4b342b73a6706eb6ce4b7e20d273b53583a64358.tar.gz
samba-4b342b73a6706eb6ce4b7e20d273b53583a64358.tar.bz2
samba-4b342b73a6706eb6ce4b7e20d273b53583a64358.zip
s3-build: pure cosmetics, use better names for gen_ndr code pieces.
Guenther
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in14
-rw-r--r--source3/wscript_build12
2 files changed, 11 insertions, 15 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c33bf27002..89f7073497 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -319,10 +319,10 @@ RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
librpc/gen_ndr/ndr_lsa.o
-LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o \
+LIBNDR_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon.o \
../librpc/ndr/ndr_netlogon.o
-LIBNDR_GEN_OBJ2 = librpc/gen_ndr/ndr_spoolss.o \
+LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \
../librpc/ndr/ndr_spoolss_buf.o
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
@@ -333,7 +333,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
librpc/gen_ndr/ndr_initshutdown.o \
librpc/gen_ndr/ndr_srvsvc.o \
librpc/gen_ndr/ndr_eventlog.o \
- $(LIBNDR_GEN_OBJ1) \
+ $(LIBNDR_NETLOGON_OBJ) \
librpc/gen_ndr/ndr_dssetup.o \
librpc/gen_ndr/ndr_notify.o \
librpc/gen_ndr/ndr_xattr.o \
@@ -341,13 +341,11 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
librpc/gen_ndr/ndr_epmapper.o \
librpc/gen_ndr/ndr_named_pipe_auth.o \
librpc/gen_ndr/ndr_ntsvcs.o \
- $(LIBNDR_GEN_OBJ2)
-
-RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
+ $(LIBNDR_SPOOLSS_OBJ)
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
-RPC_PARSE_OBJ1 = $(RPC_PARSE_OBJ0)
+RPC_PARSE_OBJ1 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o
RPC_PARSE_OBJ2 = rpc_parse/parse_rpc.o \
rpc_client/init_netlogon.o \
@@ -1311,7 +1309,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
$(PASSDB_OBJ) $(LIBTSOCKET_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
$(WBCOMMON_OBJ) \
- $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1) @BUILD_INIPARSER@
+ $(LIBNDR_GEN_OBJ0) $(LIBNDR_NETLOGON_OBJ) @BUILD_INIPARSER@
VLP_OBJ = printing/tests/vlp.o \
diff --git a/source3/wscript_build b/source3/wscript_build
index ab61d80d95..0ff206380d 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -59,10 +59,10 @@ RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c'''
LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
../librpc/gen_ndr/ndr_lsa.c'''
-LIBNDR_GEN_SRC1 = '''../librpc/gen_ndr/ndr_netlogon.c
+LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c
../librpc/ndr/ndr_netlogon.c'''
-LIBNDR_GEN_SRC2 = '''../librpc/gen_ndr/ndr_spoolss.c
+LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
../librpc/ndr/ndr_spoolss_buf.c'''
LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
@@ -73,7 +73,7 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
../librpc/gen_ndr/ndr_initshutdown.c
../librpc/gen_ndr/ndr_srvsvc.c
../librpc/gen_ndr/ndr_eventlog.c
- ${LIBNDR_GEN_SRC1}
+ ${LIBNDR_NETLOGON_SRC}
../librpc/gen_ndr/ndr_dssetup.c
librpc/gen_ndr/ndr_notify.c
../librpc/gen_ndr/ndr_xattr.c
@@ -81,13 +81,11 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
../librpc/gen_ndr/ndr_epmapper.c
../librpc/gen_ndr/ndr_named_pipe_auth.c
../librpc/gen_ndr/ndr_ntsvcs.c
- ${LIBNDR_GEN_SRC2}'''
-
-RPC_PARSE_SRC0 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
+ ${LIBNDR_SPOOLSS_SRC}'''
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
-RPC_PARSE_SRC1 = '''${RPC_PARSE_SRC0}'''
+RPC_PARSE_SRC1 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
rpc_client/init_netlogon.c