summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-27 13:38:39 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-27 13:38:39 +0200
commit5c66b80c07bfa379971ffaed1936b43a44f4e581 (patch)
tree8e9f40d6305a736c6af018001d699b506acde06e /source4
parent6cdfbd838094749557ee752fee23579ce71a0d53 (diff)
downloadsamba-5c66b80c07bfa379971ffaed1936b43a44f4e581.tar.gz
samba-5c66b80c07bfa379971ffaed1936b43a44f4e581.tar.bz2
samba-5c66b80c07bfa379971ffaed1936b43a44f4e581.zip
Move version.o and dynconfig.o into their own directory.
(This used to be commit 2cc924a412578c052a7793408300c28c8bc87c2d)
Diffstat (limited to 'source4')
-rw-r--r--source4/dynconfig/config.mk (renamed from source4/dynconfig.mk)9
-rw-r--r--source4/dynconfig/dynconfig.c (renamed from source4/dynconfig.c)0
-rw-r--r--source4/dynconfig/dynconfig.h (renamed from source4/dynconfig.h)0
-rw-r--r--source4/dynconfig/version.c (renamed from source4/lib/version.c)0
-rw-r--r--source4/main.mk3
-rw-r--r--source4/param/config.mk2
6 files changed, 6 insertions, 8 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig/config.mk
index f365911c6a..5f2887f8b6 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig/config.mk
@@ -1,6 +1,7 @@
[SUBSYSTEM::DYNCONFIG]
-DYNCONFIG_OBJ_FILES = dynconfig.o
+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))
@@ -9,10 +10,7 @@ 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)\" \
+$(dynconfigsrcdir)/dynconfig.o: CFLAGS+=-DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(bindir)\" \
-DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
-DLOCKDIR=\"$(lockdir)\" -DPIDDIR=\"$(piddir)\" -DDATADIR=\"$(datadir)\" \
-DLOGFILEBASE=\"$(logfilebase)\" \
@@ -23,4 +21,3 @@ dynconfig.o: dynconfig.c Makefile
-DTORTUREDIR=\"$(TORTUREDIR)\" \
-DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
-
diff --git a/source4/dynconfig.c b/source4/dynconfig/dynconfig.c
index 6dbbf872d9..6dbbf872d9 100644
--- a/source4/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
diff --git a/source4/dynconfig.h b/source4/dynconfig/dynconfig.h
index ac54db63d6..ac54db63d6 100644
--- a/source4/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
diff --git a/source4/lib/version.c b/source4/dynconfig/version.c
index e81f463586..e81f463586 100644
--- a/source4/lib/version.c
+++ b/source4/dynconfig/version.c
diff --git a/source4/main.mk b/source4/main.mk
index 90473cce93..b0de9525c1 100644
--- a/source4/main.mk
+++ b/source4/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/source4/param/config.mk b/source4/param/config.mk
index 02474d50b9..c169ce157e 100644
--- a/source4/param/config.mk
+++ b/source4/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