[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-1864-g2cc924a
Jelmer Vernooij
jelmer at samba.org
Tue May 27 11:39:37 GMT 2008
The branch, v4-0-test has been updated
via 2cc924a412578c052a7793408300c28c8bc87c2d (commit)
from 8d2e20fcb984c122fbf98cfe712b3145941d881d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 2cc924a412578c052a7793408300c28c8bc87c2d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue May 27 13:38:39 2008 +0200
Move version.o and dynconfig.o into their own directory.
-----------------------------------------------------------------------
Summary of changes:
source/dynconfig.c | 86 ------------------------------------------
source/dynconfig.h | 40 -------------------
source/dynconfig.mk | 26 -------------
source/dynconfig/config.mk | 23 +++++++++++
source/dynconfig/dynconfig.c | 86 ++++++++++++++++++++++++++++++++++++++++++
source/dynconfig/dynconfig.h | 40 +++++++++++++++++++
source/dynconfig/version.c | 27 +++++++++++++
source/lib/version.c | 27 -------------
source/main.mk | 3 +-
source/param/config.mk | 2 +-
10 files changed, 179 insertions(+), 181 deletions(-)
delete mode 100644 source/dynconfig.c
delete mode 100644 source/dynconfig.h
delete mode 100644 source/dynconfig.mk
create mode 100644 source/dynconfig/config.mk
create mode 100644 source/dynconfig/dynconfig.c
create mode 100644 source/dynconfig/dynconfig.h
create mode 100644 source/dynconfig/version.c
delete mode 100644 source/lib/version.c
Changeset truncated at 500 lines:
diff --git a/source/dynconfig.c b/source/dynconfig.c
deleted file mode 100644
index 6dbbf87..0000000
--- a/source/dynconfig.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Copyright (C) 2001 by Martin Pool <mbp at samba.org>
- Copyright (C) Jim McDonough (jmcd at us.ibm.com) 2003.
- Copyright (C) Stefan Metzmacher 2003
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-
-/**
- * @file dynconfig.c
- *
- * @brief Global configurations, initialized to configured defaults.
- *
- * This file should be the only file that depends on path
- * configuration (--prefix, etc), so that if ./configure is re-run,
- * all programs will be appropriately updated. Everything else in
- * Samba should import extern variables from here, rather than relying
- * on preprocessor macros.
- *
- * Eventually some of these may become even more variable, so that
- * they can for example consistently be set across the whole of Samba
- * by command-line parameters, config file entries, or environment
- * variables.
- *
- * @todo Perhaps eventually these should be merged into the parameter
- * table? There's kind of a chicken-and-egg situation there...
- **/
-
-/** Directory with generic binaries */
-_PUBLIC_ const char *dyn_BINDIR = BINDIR;
-
-/**< Location of smb.conf file. **/
-_PUBLIC_ const char *dyn_CONFIGFILE = CONFIGFILE;
-
-/** Log file directory. **/
-_PUBLIC_ const char *dyn_LOGFILEBASE = LOGFILEBASE;
-
-/** Directory for local RPC (ncalrpc: transport) */
-_PUBLIC_ const char *dyn_NCALRPCDIR = NCALRPCDIR;
-
-/** Statically configured LanMan hosts. **/
-_PUBLIC_ const char *dyn_LMHOSTSFILE = LMHOSTSFILE;
-
-/** Samba data directory. */
-_PUBLIC_ const char *dyn_DATADIR = DATADIR;
-
-_PUBLIC_ const char *dyn_MODULESDIR = MODULESDIR;
-
-/**
- * @brief Directory holding lock files.
- *
- * Not writable, but used to set a default in the parameter table.
- **/
-_PUBLIC_ const char *dyn_LOCKDIR = LOCKDIR;
-
-/** pid file directory */
-_PUBLIC_ const char *dyn_PIDDIR = PIDDIR;
-
-/** Private data directory; holds ldb files and the like */
-_PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
-
-/** SWAT directory */
-_PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
-
-/** SETUP files (source files used by the provision) */
-_PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
-
-/** EJS Javascript library includes */
-_PUBLIC_ const char *dyn_JSDIR = JSDIR;
-
-/** Where to find the winbindd socket */
-_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
diff --git a/source/dynconfig.h b/source/dynconfig.h
deleted file mode 100644
index ac54db6..0000000
--- a/source/dynconfig.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Copyright (C) 2001 by Martin Pool <mbp at samba.org>
- Copyright (C) Jim McDonough (jmcd at us.ibm.com) 2003.
-
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/**
- * @file dynconfig.h
- *
- * @brief Exported global configurations.
- **/
-
-extern const char *dyn_BINDIR;
-extern const char *dyn_CONFIGFILE;
-extern const char *dyn_NCALRPCDIR;
-extern const char *dyn_LOGFILEBASE;
-extern const char *dyn_LMHOSTSFILE;
-extern const char *dyn_DATADIR;
-extern const char *dyn_MODULESDIR;
-extern const char *dyn_LOCKDIR;
-extern const char *dyn_PIDDIR;
-extern const char *dyn_PRIVATE_DIR;
-extern const char *dyn_SWATDIR;
-extern const char *dyn_JSDIR;
-extern const char *dyn_SETUPDIR;
-extern const char *dyn_WINBINDD_SOCKET_DIR;
diff --git a/source/dynconfig.mk b/source/dynconfig.mk
deleted file mode 100644
index f365911..0000000
--- a/source/dynconfig.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-[SUBSYSTEM::DYNCONFIG]
-
-DYNCONFIG_OBJ_FILES = dynconfig.o
-
-# set these to where to find various files
-# These can be overridden by command line switches (see smbd(8))
-# or in smb.conf (see smb.conf(5))
-CONFIGFILE = $(sysconfdir)/smb.conf
-PKGCONFIGDIR = $(libdir)/pkgconfig
-LMHOSTSFILE = $(sysconfdir)/lmhosts
-
-dynconfig.o: dynconfig.c Makefile
- @echo Compiling $<
- @$(CC) $(CFLAGS) $(CPPFLAGS) $(PICFLAG) -c $< -o $@ \
- -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \
- -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
- -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
- -DLOGFILEBASE=\"$(logfilebase)\" \
- -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
- -DSWATDIR=\"$(SWATDIR)\" \
- -DPRIVATE_DIR=\"$(privatedir)\" \
- -DMODULESDIR=\"$(modulesdir)\" -DJSDIR=\"$(JSDIR)\" \
- -DTORTUREDIR=\"$(TORTUREDIR)\" \
- -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
-
-
diff --git a/source/dynconfig/config.mk b/source/dynconfig/config.mk
new file mode 100644
index 0000000..5f2887f
--- /dev/null
+++ b/source/dynconfig/config.mk
@@ -0,0 +1,23 @@
+[SUBSYSTEM::DYNCONFIG]
+
+DYNCONFIG_OBJ_FILES = $(dynconfigsrcdir)/dynconfig.o \
+ $(dynconfigsrcdir)/version.o
+
+# set these to where to find various files
+# These can be overridden by command line switches (see smbd(8))
+# or in smb.conf (see smb.conf(5))
+CONFIGFILE = $(sysconfdir)/smb.conf
+PKGCONFIGDIR = $(libdir)/pkgconfig
+LMHOSTSFILE = $(sysconfdir)/lmhosts
+
+$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \
+ -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
+ -DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
+ -DLOGFILEBASE=\"$(logfilebase)\" \
+ -DCONFIGDIR=\"$(sysconfdir)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \
+ -DSWATDIR=\"$(SWATDIR)\" \
+ -DPRIVATE_DIR=\"$(privatedir)\" \
+ -DMODULESDIR=\"$(modulesdir)\" -DJSDIR=\"$(JSDIR)\" \
+ -DTORTUREDIR=\"$(TORTUREDIR)\" \
+ -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
+
diff --git a/source/dynconfig/dynconfig.c b/source/dynconfig/dynconfig.c
new file mode 100644
index 0000000..6dbbf87
--- /dev/null
+++ b/source/dynconfig/dynconfig.c
@@ -0,0 +1,86 @@
+/*
+ Unix SMB/CIFS implementation.
+ Copyright (C) 2001 by Martin Pool <mbp at samba.org>
+ Copyright (C) Jim McDonough (jmcd at us.ibm.com) 2003.
+ Copyright (C) Stefan Metzmacher 2003
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+
+/**
+ * @file dynconfig.c
+ *
+ * @brief Global configurations, initialized to configured defaults.
+ *
+ * This file should be the only file that depends on path
+ * configuration (--prefix, etc), so that if ./configure is re-run,
+ * all programs will be appropriately updated. Everything else in
+ * Samba should import extern variables from here, rather than relying
+ * on preprocessor macros.
+ *
+ * Eventually some of these may become even more variable, so that
+ * they can for example consistently be set across the whole of Samba
+ * by command-line parameters, config file entries, or environment
+ * variables.
+ *
+ * @todo Perhaps eventually these should be merged into the parameter
+ * table? There's kind of a chicken-and-egg situation there...
+ **/
+
+/** Directory with generic binaries */
+_PUBLIC_ const char *dyn_BINDIR = BINDIR;
+
+/**< Location of smb.conf file. **/
+_PUBLIC_ const char *dyn_CONFIGFILE = CONFIGFILE;
+
+/** Log file directory. **/
+_PUBLIC_ const char *dyn_LOGFILEBASE = LOGFILEBASE;
+
+/** Directory for local RPC (ncalrpc: transport) */
+_PUBLIC_ const char *dyn_NCALRPCDIR = NCALRPCDIR;
+
+/** Statically configured LanMan hosts. **/
+_PUBLIC_ const char *dyn_LMHOSTSFILE = LMHOSTSFILE;
+
+/** Samba data directory. */
+_PUBLIC_ const char *dyn_DATADIR = DATADIR;
+
+_PUBLIC_ const char *dyn_MODULESDIR = MODULESDIR;
+
+/**
+ * @brief Directory holding lock files.
+ *
+ * Not writable, but used to set a default in the parameter table.
+ **/
+_PUBLIC_ const char *dyn_LOCKDIR = LOCKDIR;
+
+/** pid file directory */
+_PUBLIC_ const char *dyn_PIDDIR = PIDDIR;
+
+/** Private data directory; holds ldb files and the like */
+_PUBLIC_ const char *dyn_PRIVATE_DIR = PRIVATE_DIR;
+
+/** SWAT directory */
+_PUBLIC_ const char *dyn_SWATDIR = SWATDIR;
+
+/** SETUP files (source files used by the provision) */
+_PUBLIC_ const char *dyn_SETUPDIR = SETUPDIR;
+
+/** EJS Javascript library includes */
+_PUBLIC_ const char *dyn_JSDIR = JSDIR;
+
+/** Where to find the winbindd socket */
+_PUBLIC_ const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
diff --git a/source/dynconfig/dynconfig.h b/source/dynconfig/dynconfig.h
new file mode 100644
index 0000000..ac54db6
--- /dev/null
+++ b/source/dynconfig/dynconfig.h
@@ -0,0 +1,40 @@
+/*
+ Unix SMB/CIFS implementation.
+ Copyright (C) 2001 by Martin Pool <mbp at samba.org>
+ Copyright (C) Jim McDonough (jmcd at us.ibm.com) 2003.
+
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/**
+ * @file dynconfig.h
+ *
+ * @brief Exported global configurations.
+ **/
+
+extern const char *dyn_BINDIR;
+extern const char *dyn_CONFIGFILE;
+extern const char *dyn_NCALRPCDIR;
+extern const char *dyn_LOGFILEBASE;
+extern const char *dyn_LMHOSTSFILE;
+extern const char *dyn_DATADIR;
+extern const char *dyn_MODULESDIR;
+extern const char *dyn_LOCKDIR;
+extern const char *dyn_PIDDIR;
+extern const char *dyn_PRIVATE_DIR;
+extern const char *dyn_SWATDIR;
+extern const char *dyn_JSDIR;
+extern const char *dyn_SETUPDIR;
+extern const char *dyn_WINBINDD_SOCKET_DIR;
diff --git a/source/dynconfig/version.c b/source/dynconfig/version.c
new file mode 100644
index 0000000..e81f463
--- /dev/null
+++ b/source/dynconfig/version.c
@@ -0,0 +1,27 @@
+/*
+ Unix SMB/CIFS implementation.
+ Samba Version functions
+
+ Copyright (C) Stefan Metzmacher 2003
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "version.h"
+
+const char *samba_version_string(void)
+{
+ return SAMBA_VERSION_STRING;
+}
diff --git a/source/lib/version.c b/source/lib/version.c
deleted file mode 100644
index e81f463..0000000
--- a/source/lib/version.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Samba Version functions
-
- Copyright (C) Stefan Metzmacher 2003
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "version.h"
-
-const char *samba_version_string(void)
-{
- return SAMBA_VERSION_STRING;
-}
diff --git a/source/main.mk b/source/main.mk
index 90473cc..b0de952 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -1,4 +1,5 @@
-mkinclude dynconfig.mk
+dynconfigsrcdir := dynconfig
+mkinclude dynconfig/config.mk
heimdalsrcdir := heimdal
mkinclude heimdal_build/config.mk
mkinclude config.mk
diff --git a/source/param/config.mk b/source/param/config.mk
index 02474d5..c169ce1 100644
--- a/source/param/config.mk
+++ b/source/param/config.mk
@@ -6,7 +6,7 @@ LIBSAMBA-HOSTCONFIG_VERSION = 0.0.1
LIBSAMBA-HOSTCONFIG_SOVERSION = 0
LIBSAMBA-HOSTCONFIG_OBJ_FILES = $(addprefix $(paramsrcdir)/, \
- loadparm.o generic.o util.o) lib/version.o
+ loadparm.o generic.o util.o)
PUBLIC_HEADERS += param/param.h
--
Samba Shared Repository
More information about the samba-cvs
mailing list