From 3c9a28f85ed4dd8ed265581d3ded8fcc907b6645 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 3 Nov 2006 22:35:52 +0000 Subject: r19543: Make dynconfig less special. (This used to be commit 2780274e6fb25cec78ad341239090ed286ed1a45) --- source4/build/smb_build/makefile.pm | 7 ++----- source4/param/config.mk | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'source4') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 8191d82408..8bc480d4df 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -344,9 +344,6 @@ sub Binary($$) } 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 @@ sub Binary($$) $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__ ); diff --git a/source4/param/config.mk b/source4/param/config.mk index 683079c163..63609490a3 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -8,6 +8,7 @@ OBJ_FILES = loadparm.o \ util.o \ ../lib/version.o PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL +PRIVATE_DEPENDENCIES = DYNCONFIG PUBLIC_PROTO_HEADER = proto.h PUBLIC_HEADERS = param.h -- cgit