[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-112-geffc25e

Jelmer Vernooij jelmer at samba.org
Wed Jun 25 17:27:37 GMT 2008


The branch, v4-0-test has been updated
       via  effc25e805facea001ebd64d383f1a536c61d0e3 (commit)
       via  a422c6c5ff47f36ef3376f54e707561c6a53ac23 (commit)
      from  55a6e852c77ffb91d2e0a0503dab06214f675db8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit effc25e805facea001ebd64d383f1a536c61d0e3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 19:06:59 2008 +0200

    Use variable for popt source dir.

commit a422c6c5ff47f36ef3376f54e707561c6a53ac23
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 25 19:04:03 2008 +0200

    Use ldbsrcdir rather than ldbdir.

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

Summary of changes:
 source/Makefile                    |    1 +
 source/lib/ldb/ldb_ildap/config.mk |    2 +-
 source/lib/ldb/tools/config.mk     |   28 ++++++++++++++--------------
 source/lib/popt/config.mk          |    2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index 37d601f..1889ba2 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -71,6 +71,7 @@ smbreadlinesrcdir := lib/smbreadline
 libmessagingsrcdir := lib/messaging
 libeventssrcdir := lib/events
 libcmdlinesrcdir := lib/cmdline
+poptsrcdir := lib/popt
 socketwrappersrcdir := lib/socket_wrapper
 nsswrappersrcdir := lib/nss_wrapper
 appwebsrcdir := lib/appweb
diff --git a/source/lib/ldb/ldb_ildap/config.mk b/source/lib/ldb/ldb_ildap/config.mk
index 94e3380..99e101f 100644
--- a/source/lib/ldb/ldb_ildap/config.mk
+++ b/source/lib/ldb/ldb_ildap/config.mk
@@ -9,5 +9,5 @@ ALIASES = ldapi ldaps ldap
 # End MODULE ldb_ildap
 ################################################
 
-ldb_ildap_OBJ_FILES = $(ldbdir)/ldb_ildap/ldb_ildap.o
+ldb_ildap_OBJ_FILES = $(ldbsrcdir)/ldb_ildap/ldb_ildap.o
 
diff --git a/source/lib/ldb/tools/config.mk b/source/lib/ldb/tools/config.mk
index 051fd0c..6b57929 100644
--- a/source/lib/ldb/tools/config.mk
+++ b/source/lib/ldb/tools/config.mk
@@ -1,13 +1,13 @@
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
-CFLAGS = -I$(ldbdir) -I$(ldbdir)/include
+CFLAGS = -I$(ldbsrcdir) -I$(ldbsrcdir)/include
 PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
 # End SUBSYSTEM LIBLDB_CMDLINE
 ################################################
 
-LIBLDB_CMDLINE_OBJ_FILES = $(ldbdir)/tools/cmdline.o
+LIBLDB_CMDLINE_OBJ_FILES = $(ldbsrcdir)/tools/cmdline.o
 
 ################################################
 # Start BINARY ldbadd
@@ -19,9 +19,9 @@ PRIVATE_DEPENDENCIES = \
 ################################################
 
 
-ldbadd_OBJ_FILES = $(ldbdir)/tools/ldbadd.o
+ldbadd_OBJ_FILES = $(ldbsrcdir)/tools/ldbadd.o
 
-MANPAGES += $(ldbdir)/man/ldbadd.1
+MANPAGES += $(ldbsrcdir)/man/ldbadd.1
 
 ################################################
 # Start BINARY ldbdel
@@ -32,9 +32,9 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ldbdel
 ################################################
 
-ldbdel_OBJ_FILES = $(ldbdir)/tools/ldbdel.o
+ldbdel_OBJ_FILES = $(ldbsrcdir)/tools/ldbdel.o
 
-MANPAGES += $(ldbdir)/man/ldbdel.1
+MANPAGES += $(ldbsrcdir)/man/ldbdel.1
 
 ################################################
 # Start BINARY ldbmodify
@@ -45,8 +45,8 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ldbmodify
 ################################################
 
-ldbmodify_OBJ_FILES = $(ldbdir)/tools/ldbmodify.o
-MANPAGES += $(ldbdir)/man/ldbmodify.1
+ldbmodify_OBJ_FILES = $(ldbsrcdir)/tools/ldbmodify.o
+MANPAGES += $(ldbsrcdir)/man/ldbmodify.1
 
 ################################################
 # Start BINARY ldbsearch
@@ -57,9 +57,9 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ldbsearch
 ################################################
 
-ldbsearch_OBJ_FILES = $(ldbdir)/tools/ldbsearch.o
+ldbsearch_OBJ_FILES = $(ldbsrcdir)/tools/ldbsearch.o
 
-MANPAGES += $(ldbdir)/man/ldbsearch.1
+MANPAGES += $(ldbsrcdir)/man/ldbsearch.1
 
 ################################################
 # Start BINARY ldbedit
@@ -70,9 +70,9 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ldbedit
 ################################################
 
-ldbedit_OBJ_FILES = $(ldbdir)/tools/ldbedit.o
+ldbedit_OBJ_FILES = $(ldbsrcdir)/tools/ldbedit.o
 
-MANPAGES += $(ldbdir)/man/ldbedit.1
+MANPAGES += $(ldbsrcdir)/man/ldbedit.1
 
 ################################################
 # Start BINARY ldbrename
@@ -83,8 +83,8 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY ldbrename
 ################################################
 
-ldbrename_OBJ_FILES = $(ldbdir)/tools/ldbrename.o
+ldbrename_OBJ_FILES = $(ldbsrcdir)/tools/ldbrename.o
 
-MANPAGES += $(ldbdir)/man/ldbrename.1
+MANPAGES += $(ldbsrcdir)/man/ldbrename.1
 
 
diff --git a/source/lib/popt/config.mk b/source/lib/popt/config.mk
index 86d440a..e015577 100644
--- a/source/lib/popt/config.mk
+++ b/source/lib/popt/config.mk
@@ -1,5 +1,5 @@
 [SUBSYSTEM::LIBPOPT]
 CFLAGS = -Ilib/popt
 
-LIBPOPT_OBJ_FILES = $(addprefix lib/popt/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
+LIBPOPT_OBJ_FILES = $(addprefix $(poptsrcdir)/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list