diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 14:20:31 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-26 14:20:31 +0100 |
| commit | 39eb63039163cf7625edf5c0a33112a0659c3eca (patch) | |
| tree | 9f22252686936ff180d80acd94fd8cb25c297ce7 /source4 | |
| parent | db2a2382d1dfcb9ace4621368feebd700b598625 (diff) | |
| download | samba-39eb63039163cf7625edf5c0a33112a0659c3eca.tar.gz samba-39eb63039163cf7625edf5c0a33112a0659c3eca.tar.bz2 samba-39eb63039163cf7625edf5c0a33112a0659c3eca.zip | |
Rely on GNU make to build static libraries.
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit f34a17a92bcc9a27b629a6ec9ed9a818bd13acc0)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 11 | ||||
| -rw-r--r-- | source4/rules.mk | 7 |
2 files changed, 8 insertions, 10 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 17474db00e..29da771353 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -281,16 +281,7 @@ sub StaticLibrary($$) $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); - $self->output(<< "__EOD__" -# -$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST) - \@echo Linking \$@ - \@rm -f \$@ - \@mkdir -p $ctx->{STATICDIR} - \@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{NAME}_FULL_OBJ_LIST) - -__EOD__ -); + $self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n"); } sub Header($$) diff --git a/source4/rules.mk b/source4/rules.mk index b6a54fae25..9791466712 100644 --- a/source4/rules.mk +++ b/source4/rules.mk @@ -100,6 +100,13 @@ check:: test unused_macros: $(srcdir)/script/find_unused_macros.pl `find . -name "*.[ch]"` | sort +# Create a static library +%.a: + @echo Linking $@ + @rm -f $@ + @mkdir -p $(@D) + @$(STLD) $(STLD_FLAGS) $@ $^ + ############################################################################### # File types ############################################################################### |