svn commit: samba r19543 - in branches/SAMBA_4_0/source: build/smb_build param

[jelmer at samba.org]

Author: jelmer
Date: 2006-11-03 22:35:52 +0000 (Fri, 03 Nov 2006)
New Revision: 19543

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

Log:
Make dynconfig less special.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/param/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-11-03 20:00:14 UTC (rev 19542)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-11-03 22:35:52 UTC (rev 19543)
@@ -344,9 +344,6 @@
 	}
 	my $localdir = "bin$extradir";
 
-	my $dynconfig = "dynconfig.o";
-	my $dynconfig_install = "dynconfig.o";
-	
 	$installdir = "bin$extradir";
 
 	push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)");
@@ -369,10 +366,10 @@
 	$self->_prepare_list($ctx, "LINK_FLAGS");
 
 $self->output(<< "__EOD__"
-$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $dynconfig_install
+$installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
 	\@echo Linking \$\@
 	\@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
-		$dynconfig_install \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
+		\$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) 
 
 __EOD__
 );

Modified: branches/SAMBA_4_0/source/param/config.mk
===================================================================
--- branches/SAMBA_4_0/source/param/config.mk	2006-11-03 20:00:14 UTC (rev 19542)
+++ branches/SAMBA_4_0/source/param/config.mk	2006-11-03 22:35:52 UTC (rev 19543)
@@ -8,6 +8,7 @@
 			util.o \
 			../lib/version.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
+PRIVATE_DEPENDENCIES = DYNCONFIG
 PUBLIC_PROTO_HEADER = proto.h
 PUBLIC_HEADERS = param.h