From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 May 2008 11:38:39 +0000 (+0200)
Subject: Move version.o and dynconfig.o into their own directory.
X-Git-Tag: samba-4.0.0alpha4~26^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2cc924a412578c052a7793408300c28c8bc87c2d;p=thirdparty%2Fsamba.git

Move version.o and dynconfig.o into their own directory.
---

diff --git a/source/dynconfig.mk b/source/dynconfig/config.mk
similarity index 78%
rename from source/dynconfig.mk
rename to source/dynconfig/config.mk
index f365911c6a0..5f2887f8b64 100644
--- a/source/dynconfig.mk
+++ b/source/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/source/dynconfig.c b/source/dynconfig/dynconfig.c
similarity index 100%
rename from source/dynconfig.c
rename to source/dynconfig/dynconfig.c
diff --git a/source/dynconfig.h b/source/dynconfig/dynconfig.h
similarity index 100%
rename from source/dynconfig.h
rename to source/dynconfig/dynconfig.h
diff --git a/source/lib/version.c b/source/dynconfig/version.c
similarity index 100%
rename from source/lib/version.c
rename to source/dynconfig/version.c
diff --git a/source/main.mk b/source/main.mk
index 90473cce931..b0de9525c18 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 02474d50b91..c169ce157e8 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