svn commit: samba r12772 - in branches/SAMBA_4_0/source: . build/smb_build librpc

[metze at samba.org]

Author: metze
Date: 2006-01-08 17:13:13 +0000 (Sun, 08 Jan 2006)
New Revision: 12772

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12772

Log:
- create variables for the %(patsubst ...) statements for the idl files
- this also fixes the build on BSD systems

metze
Modified:
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/librpc/config.mk
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2006-01-08 15:31:25 UTC (rev 12771)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2006-01-08 17:13:13 UTC (rev 12772)
@@ -152,6 +152,7 @@
 
 		# global stuff is considered part of the makefile
 		if ($section eq "GLOBAL") {
+			if (!$infragment) { $makefile.="\n"; }
 			$makefile .= $line;
 			$infragment = 1;
 			next;

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-01-08 15:31:25 UTC (rev 12771)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-01-08 17:13:13 UTC (rev 12772)
@@ -505,12 +505,9 @@
 
 	if ($self->{developer}) {
 		$self->output(<<__EOD__
+
 #-include \$(ALL_OBJS:.o=.d)
-IDL_FILES = \$(wildcard librpc/idl/*.idl)
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.c,\$(IDL_FILES)) \\
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_\%_c.c,\$(IDL_FILES)) \\
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_\%_ejs.c,\$(IDL_FILES)) \\
-\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.h,\$(IDL_FILES)): idl
+
 __EOD__
 );
 	}

Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk	2006-01-08 15:31:25 UTC (rev 12771)
+++ branches/SAMBA_4_0/source/librpc/config.mk	2006-01-08 17:13:13 UTC (rev 12772)
@@ -296,10 +296,9 @@
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
 
-librpc/gen_ndr/tables.c: $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.h,$(IDL_FILES))
-	@$(PERL) librpc/tables.pl --output=librpc/gen_ndr/tables.c $^
+librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES)
+	@$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_HEADER_FILES)
 
-
 [SUBSYSTEM::NDR_IFACE_TABLE]
 OBJ_FILES = gen_ndr/tables.o
 NOPROTO = YES

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-01-08 15:31:25 UTC (rev 12771)
+++ branches/SAMBA_4_0/source/main.mk	2006-01-08 17:13:13 UTC (rev 12772)
@@ -181,6 +181,23 @@
 installpidl: pidl/Makefile
 	cd pidl && $(MAKE) install
 
+IDL_FILES = $(wildcard librpc/idl/*.idl)
+IDL_HEADER_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/%.h,$(IDL_FILES))
+IDL_NDR_HEADER_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.h,$(IDL_FILES))
+IDL_NDR_PARSE_C_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.c,$(IDL_FILES))
+IDL_NDR_CLIENT_C_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_c.c,$(IDL_FILES))
+IDL_NDR_SERVER_C_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_s.c,$(IDL_FILES))
+IDL_NDR_EJS_C_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_ejs.c,$(IDL_FILES))
+IDL_NDR_EJS_H_FILES = $(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%_ejs.h,$(IDL_FILES))
+
+$(IDL_HEADER_FILES): idl
+$(IDL_NDR_HEADER_FILES): idl
+$(IDL_NDR_PARSE_C_FILES): idl
+$(IDL_NDR_CLIENT_C_FILES): idl
+$(IDL_NDR_SERVER_C_FILES): idl
+$(IDL_NDR_EJS_C_FILES): idl
+$(IDL_NDR_EJS_H_FILES): idl
+
 idl_full: pidl/lib/Parse/Pidl/IDL.pm
 	@CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh FULL $(PIDL_ARGS)