[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1049-ga9fe1b7
Jelmer Vernooij
jelmer at samba.org
Wed Feb 27 12:17:43 GMT 2008
The branch, v4-0-test has been updated
via a9fe1b785dd59acbfab4eb90256e7a0cb0f4da6e (commit)
via f34a17a92bcc9a27b629a6ec9ed9a818bd13acc0 (commit)
from ff311e613226e660998824b887cb9595ffbe0275 (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit a9fe1b785dd59acbfab4eb90256e7a0cb0f4da6e
Merge: f34a17a92bcc9a27b629a6ec9ed9a818bd13acc0 ff311e613226e660998824b887cb9595ffbe0275
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Feb 27 13:17:08 2008 +0100
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake-simple
commit f34a17a92bcc9a27b629a6ec9ed9a818bd13acc0
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Feb 26 14:20:31 2008 +0100
Rely on GNU make to build static libraries.
Conflicts:
source/build/smb_build/makefile.pm
-----------------------------------------------------------------------
Summary of changes:
source/build/smb_build/makefile.pm | 11 +----------
source/rules.mk | 7 +++++++
2 files changed, 8 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 17474db..29da771 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/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/source/rules.mk b/source/rules.mk
index b6a54fa..9791466 100644
--- a/source/rules.mk
+++ b/source/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
###############################################################################
--
Samba Shared Repository
More information about the samba-cvs
mailing list