From 45d481fa7ec4f050a28ab345b564bae1b3a86af9 Mon Sep 17 00:00:00 2001
From: Richard Sharpe <sharpe@samba.org>
Date: Mon, 27 Jan 2003 05:54:30 +0000
Subject: [PATCH] Fix the dependency on GNU Make introduced by the DYNAMIC RPC
 stuff.

I have not tested this in a GNU MAKE environment yet.
(This used to be commit 5e99472d5b68dc393a5468b8949c3ad962a239f7)
---
 source3/Makefile.in | 63 ++++++++++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 42 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 9cc7424edf2..fbeba693149 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -227,48 +227,27 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
 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
 
-RPC_SERVER_OBJ = $(RPC_PIPE_OBJ)
-
-ifeq (@LSA_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_lsarpc.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_LSA_OBJ)
-endif
-ifeq (@NETLOG_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_NETLOGON.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_NETLOG_OBJ)
-endif
-ifeq (@SAMR_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_samr.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_SAMR_OBJ)
-endif
-ifeq (@SVC_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_srvsvc.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_SVC_OBJ)
-endif
-ifeq (@WKS_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_wkssvc.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_WKS_OBJ)
-endif
-ifeq (@REG_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_winreg.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_REG_OBJ)
-endif
-ifeq (@SPOOLSS_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_spoolss.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_SPOOLSS_OBJ)
-endif
-ifeq (@DFS_DYNAMIC@,yes)
-		RPC_MODULES := $(RPC_MODULES) bin/librpc_netdfs.@SHLIBEXT@
-else
-		RPC_SERVER_OBJ := $(RPC_SERVER_OBJ) $(RPC_DFS_OBJ)
-endif
+# 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)
 
 
 # this includes only the low level parse code, not stuff
-- 
2.11.4.GIT