diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 16:08:32 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 16:08:32 +0100 |
| commit | 6060aa91c4d85b20d70594b271c0e1ee155dba2b (patch) | |
| tree | 7000a8ca83d270511311d70ff04a333f2cc7224c | |
| parent | e4af554c5627d8c3e20cc451da092c09f2489295 (diff) | |
| download | samba-6060aa91c4d85b20d70594b271c0e1ee155dba2b.tar.gz samba-6060aa91c4d85b20d70594b271c0e1ee155dba2b.tar.bz2 samba-6060aa91c4d85b20d70594b271c0e1ee155dba2b.zip | |
Rely on GNU make to build static libraries.
(This used to be commit 8e9856412befc0ea94536dd492588f232347564a)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 | ||||
| -rw-r--r-- | source4/rules.mk | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 7fd31a5114..a560b1a1cf 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -290,10 +290,6 @@ sub StaticLibrary($$) $self->output(<< "__EOD__" # $ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST) - \@echo Linking \$@ - \@rm -f \$@ - \@mkdir -p $ctx->{STATICDIR} - \@\$(STLD) \$(STLD_FLAGS) \$@ \$($ctx->{NAME}_FULL_OBJ_LIST) __EOD__ ); diff --git a/source4/rules.mk b/source4/rules.mk index 1ef751b00a..857e946d34 100644 --- a/source4/rules.mk +++ b/source4/rules.mk @@ -97,6 +97,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 ############################################################################### |