s3-build: some makefile cosmetics.

Guenther

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5614edf50e1348fdc64501061e7ea017156ca476..8291f4190d6575dc5d990bf71807667e5e2af4e5 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -322,9 +322,15 @@ LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
 LIBNDR_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon.o \
                  ../librpc/ndr/ndr_netlogon.o
 
+LIBNDR_SCHANNEL_OBJ = librpc/gen_ndr/ndr_schannel.o \
+                     ../librpc/ndr/ndr_schannel.o
+
 LIBNDR_SPOOLSS_OBJ = librpc/gen_ndr/ndr_spoolss.o \
                  ../librpc/ndr/ndr_spoolss_buf.o
 
+LIBNDR_NTPRINTING_OBJ = librpc/gen_ndr/ndr_ntprinting.o \
+                       ../librpc/ndr/ndr_ntprinting.o \
+
 LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
                 $(LIBNDR_GEN_OBJ0) \
                 librpc/gen_ndr/ndr_dfs.o \
@@ -510,8 +516,7 @@ TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o
 SCHANNEL_OBJ = ../libcli/auth/credentials.o \
               ../libcli/auth/schannel_sign.o \
               ../libcli/auth/schannel_state_tdb.o \
-              librpc/gen_ndr/ndr_schannel.o \
-              ../librpc/ndr/ndr_schannel.o
+              $(LIBNDR_SCHANNEL_OBJ)
 
 LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             libsmb/clikrb5.o libsmb/clispnego.o \
@@ -1033,8 +1038,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
           utils/net_serverid.o \
           utils/net_eventlog.o \
           utils/net_printing.o \
-          librpc/gen_ndr/ndr_ntprinting.o \
-          ../librpc/ndr/ndr_ntprinting.o
+          $(LIBNDR_NTPRINTING_OBJ)
+
 
 # these are not processed by make proto
 NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o

diff --git a/source3/wscript_build b/source3/wscript_build
index 337b840075c4ec79cff10cdcc69ca062e80d5299..e231a4100e17c5eb3f7a9b03add3912838726556 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -62,6 +62,9 @@ LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
 LIBNDR_NETLOGON_SRC = '''../librpc/gen_ndr/ndr_netlogon.c
                   ../librpc/ndr/ndr_netlogon.c'''
 
+LIBNDR_SCHANNEL_SRC = '''../librpc/gen_ndr/ndr_schannel.c
+                  ../librpc/ndr/ndr_schannel.c'''
+
 LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
                   ../librpc/ndr/ndr_spoolss_buf.c'''
 
@@ -255,8 +258,7 @@ TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 SCHANNEL_SRC = '''../libcli/auth/credentials.c
                ../libcli/auth/schannel_sign.c
                ../libcli/auth/schannel_state_tdb.c
-               ../librpc/gen_ndr/ndr_schannel.c
-               ../librpc/ndr/ndr_schannel.c'''
+               ${LIBNDR_SCHANNEL_SRC}'''
 
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clikrb5.c libsmb/clispnego.c