diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:45:37 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:45:37 +0100 |
| commit | b718062f557ccf2bb5c1c6c2e3112dcff52ab81d (patch) | |
| tree | 7cff50c710087d2be499b0af2757f5d2e3b4b35f | |
| parent | 7b81f287a0389087134cc54b00486541c4b06c43 (diff) | |
| download | samba-b718062f557ccf2bb5c1c6c2e3112dcff52ab81d.tar.gz samba-b718062f557ccf2bb5c1c6c2e3112dcff52ab81d.tar.bz2 samba-b718062f557ccf2bb5c1c6c2e3112dcff52ab81d.zip | |
Avoid creating a whole bunch of files in bin/modules.
(This used to be commit dadae70042600f13f6f9bfcf2d045a797e2b9e69)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 4778c901d3..2780b00cbe 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -129,8 +129,6 @@ sub SharedModule($$) { my ($self,$ctx) = @_; - my $init_obj = ""; - my $sane_subsystem = lc($ctx->{SUBSYSTEM}); $sane_subsystem =~ s/^lib//; @@ -170,30 +168,17 @@ sub SharedModule($$) $init_fn =~ s/\(\*\)/init_module/; my $proto_fn = $ctx->{INIT_FUNCTION_TYPE}; $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/; - - $self->output(<< "__EOD__" -bin/$ctx->{NAME}_init_module.c: - \@echo Creating \$\@ - \@echo \"#include \\\"includes.h\\\"\" > \$\@ - \@echo \"$proto_fn;\" >> \$\@ - \@echo \"_PUBLIC_ $init_fn\" >> \$\@ - \@echo \"{\" >> \$\@ - \@echo \" return $ctx->{INIT_FUNCTION}();\" >> \$\@ - \@echo \"}\" >> \$\@ - \@echo \"\" >> \$\@ -__EOD__ -); - $init_obj = "bin/$ctx->{NAME}_init_module.o"; + $self->output("\$($ctx->{NAME}_OBJ_LIST): CFLAGS+=-D$ctx->{INIT_FUNCTION}=init_module\n"); } $self->output(<< "__EOD__" # -$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST) $init_obj +$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST) \@echo Linking \$\@ \@mkdir -p $ctx->{SHAREDDIR} \@\$(MDLD) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ - \$($ctx->{NAME}\_OBJ_LIST) $init_obj \\ + \$($ctx->{NAME}\_OBJ_LIST) \\ \$($ctx->{NAME}_LINK_FLAGS) __EOD__ ); |