diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-03 22:35:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:47 -0500 |
| commit | 3c9a28f85ed4dd8ed265581d3ded8fcc907b6645 (patch) | |
| tree | 76148252edae813c6177d1869425c450e86f7d98 /source4 | |
| parent | 70b8d2c8eb42cbde5dbf5642afd2ccc9b3c76808 (diff) | |
| download | samba-3c9a28f85ed4dd8ed265581d3ded8fcc907b6645.tar.gz samba-3c9a28f85ed4dd8ed265581d3ded8fcc907b6645.tar.bz2 samba-3c9a28f85ed4dd8ed265581d3ded8fcc907b6645.zip | |
r19543: Make dynconfig less special.
(This used to be commit 2780274e6fb25cec78ad341239090ed286ed1a45)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 7 | ||||
| -rw-r--r-- | source4/param/config.mk | 1 |
2 files changed, 3 insertions, 5 deletions
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 |