[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-765-g5c0edba

Jelmer Vernooij jelmer at samba.org
Mon Sep 28 04:28:40 MDT 2009


The branch, master has been updated
       via  5c0edba8c2ade663d630a3b9f3ff0c4862129783 (commit)
       via  166f849a5155d821706942e30a6cb7a4724d2348 (commit)
      from  4a230b5e6ccbd7e8ac3dce875014715b733bb210 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5c0edba8c2ade663d630a3b9f3ff0c4862129783
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Sep 28 12:25:13 2009 +0200

    Move samba-specific variable to s4 Makefile.

commit 166f849a5155d821706942e30a6cb7a4724d2348
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Sep 28 12:21:06 2009 +0200

    make: Use $(base_srcdirs) in 'make clean' rather than keeping a separate
    list.

-----------------------------------------------------------------------

Summary of changes:
 source4/Makefile            |    4 +++-
 source4/build/make/rules.mk |    2 --
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/Makefile b/source4/Makefile
index 959d0f4..03b4e73 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -47,6 +47,8 @@ ALL_PREDEP = basics
 .NOTPARALLEL:
 endif
 
+base_srcdirs = $(srcdir) ../librpc/ ../lib/ ../libcli ../libgpo ../nsswitch ../libds
+
 include $(srcdir)/build/make/rules.mk
 include $(srcdir)/build/make/python.mk
 zlibsrcdir := ../lib/zlib
@@ -153,7 +155,7 @@ include $(srcdir)/static_deps.mk
 endif
 
 clean::
-	@find ../libds ../lib ../libcli ../librpc ../libgpo ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f
+	@find $(base_srcdirs) -name '*.o' -o -name '*.ho' | xargs rm -f
 
 PUBLIC_HEADERS += ./version.h
 
diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
index 78b4240..b922f7c 100644
--- a/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@ -182,8 +182,6 @@ showflags::
 	@echo '  MDLD_FLAGS = $(MDLD_FLAGS)'
 	@echo '  SHLIBEXT   = $(SHLIBEXT)'
 
-base_srcdirs = $(srcdir) ../librpc/ ../lib/ ../libcli ../libgpo ../nsswitch ../libds
-
 etags:
 	etags $(ETAGS_OPTIONS) `find $(base_srcdirs) -name "*.[ch]"`
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list