One more try to get rid of the dependency on GNU MAKE

(This used to be commit a96592fb69fdebc5abe97a0b46055bd1486e7b94)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index fbeba693149d63442a86921cb4eb40533026caf9..d8ee33d65f0a253e3e515179b21f9193dbafef0e 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -228,27 +228,28 @@ RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o rpc_server/srv_util.o \
                rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o
 
 # These are like they are to avoid a dependency on GNU MAKE
-RPC_MODULES = \
-@LSA_DYNAMIC_YES@      bin/librpc_lsarpc.@SHLIBEXT@\
-@NETLOG_DYNAMIC_YES@   bin/librpc_NETLOGON.@SHLIBEXT@ \
-@SAMR_DYNAMIC_YES@     bin/librpc_samr.@SHLIBEXT@ \
-@SVC_DYNAMIC_YES@      bin/librpc_srvsvc.@SHLIBEXT@ \
-@WKS_DYNAMIC_YES@      bin/librpc_wkssvc.@SHLIBEXT@ \
-@REG_DYNAMIC_YES@      bin/librpc_winreg.@SHLIBEXT@ \
-@SPOOLSS_DYNAMIC_YES@  bin/librpc_spoolss.@SHLIBEXT@ \
-@DFS_DYNAMIC_YES@      bin/librpc_netdfs.@SHLIBEXT@
-
-
-RPC_SERVER_OBJ = $(RPC_PIPE_OBJ) \
-@LSA_DYNAMIC_NO@       $(RPC_LSA_OBJ) \
-@NETLOG_DYNAMIC_NO@    $(RPC_NETLOG_OBJ) \
-@SAMR_DYNAMIC_NO@      $(RPC_SAMR_OBJ) \
-@SVC_DYNAMIC_NO@       $(RPC_SVC_OBJ) \
-@WKS_DYNAMIC_NO@       $(RPC_WKS_OBJ) \
-@REG_DYNAMIC_NO@       $(RPC_REG_OBJ) \
-@SPOOLSS_DYNAMIC_NO@   $(RPC_SPOOLSS_OBJ) \
-@DFS_DYNAMIC_NO@       $(RPC_DFS_OBJ)
-
+@LSA_DYNAMIC_YES@RPC_MODULES1 = bin/librpc_lsarpc.@SHLIBEXT@
+@NETLOG_DYNAMIC_YES@RPC_MODULES2 = bin/librpc_NETLOGON.@SHLIBEXT@
+@SAMR_DYNAMIC_YES@RPC_MODULES3 = bin/librpc_samr.@SHLIBEXT@
+@SVC_DYNAMIC_YES@RPC_MODULES4 = bin/librpc_srvsvc.@SHLIBEXT@
+@WKS_DYNAMIC_YES@RPC_MODULES5 = bin/librpc_wkssvc.@SHLIBEXT@
+@REG_DYNAMIC_YES@RPC_MODULES6 = bin/librpc_winreg.@SHLIBEXT@
+@SPOOLSS_DYNAMIC_YES@RPC_MODULES7 = bin/librpc_spoolss.@SHLIBEXT@
+@DFS_DYNAMIC_YES@RPC_MODULES8 = bin/librpc_netdfs.@SHLIBEXT@
+RPC_MODULES = $(RPC_MODULES1) $(RPC_MODULES2) $(RPC_MODULES3) $(RPC_MODULES4) \
+       $(RPC_MODULES5) $(RPC_MODULES6) $(RPC_MODULES7) $(RPC_MODULES8)
+
+@LSA_DYNAMIC_NO@RPC_PIPE_OBJ1 = $(RPC_LSA_OBJ)
+@NETLOG_DYNAMIC_NO@RPC_PIPE_OBJ2 = $(RPC_NETLOG_OBJ)
+@SAMR_DYNAMIC_NO@RPC_PIPE_OBJ3 = $(RPC_SAMR_OBJ)
+@SVC_DYNAMIC_NO@RPC_PIPE_OBJ4 = $(RPC_SVC_OBJ)
+@WKS_DYNAMIC_NO@RPC_PIPE_OBJ5 = $(RPC_WKS_OBJ)
+@REG_DYNAMIC_NO@RPC_PIPE_OBJ6 = $(RPC_REG_OBJ)
+@SPOOLSS_DYNAMIC_NO@RPC_PIPE_OBJ7 = $(RPC_SPOOLSS_OBJ)
+@DFS_DYNAMIC_NO@RPC_PIPE_OBJ8 =        $(RPC_DFS_OBJ)
+RPC_SERVER_OBJ = $(RPC_PIPE_OBJ1) $(RPC_PIPE_OBJ2) $(RPC_PIPE_OBJ3) \
+       $(RPC_PIPE_OBJ4) $(RPC_PIPE_OBJ5) $(RPC_PIPE_OBJ6) $(RPC_PIPE_OBJ7) \
+       $(RPC_PIPE_OBJ8)
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts