summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-18 21:10:41 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-18 21:10:41 +0200
commite3a615172e43347f31ad260f0f7ce28a39265257 (patch)
tree8e87c7ead0b211ccd9990fb6cb8173f3386f471a
parentdc114f8c5acbcffe2f7114083f3e058f17fb4fa2 (diff)
parent78f804c497249cc807d8f2d7ac914288b3739c49 (diff)
downloadsamba-e3a615172e43347f31ad260f0f7ce28a39265257.tar.gz
samba-e3a615172e43347f31ad260f0f7ce28a39265257.tar.xz
samba-e3a615172e43347f31ad260f0f7ce28a39265257.zip
Merge branch 'v4-0-test' of /home/jelmer/samba34.git/samba4 into v4-0-test
Conflicts: source/build/smb_build/makefile.pm (This used to be commit 57b57b1ff9a2ddf087fc6cceaf6c9afb4f8f0135)
-rw-r--r--source4/auth/ntlmssp/config.mk2
-rw-r--r--source4/build/make/templates.mk4
-rw-r--r--source4/build/smb_build/config_mk.pm7
-rw-r--r--source4/dynconfig.mk11
4 files changed, 12 insertions, 12 deletions
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 9909e3e0bb8..3400ee2aebc 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -14,4 +14,4 @@ OUTPUT_TYPE = MERGED_OBJ
# End MODULE gensec_ntlmssp
################################################
-gensec_ntlmssp_OBJ_FILES = $(addprefix $((authsrcdir)/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o)
+gensec_ntlmssp_OBJ_FILES = $(addprefix $(authsrcdir)/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o)
diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk
index e3ecffb02db..87aa30c0c0b 100644
--- a/source4/build/make/templates.mk
+++ b/source4/build/make/templates.mk
@@ -1,6 +1,8 @@
-# Temapltes file for Samba 4
+# Templates file for Samba 4
# This relies on GNU make.
#
+# © 2008 Jelmer Vernooij <jelmer@samba.org>
+#
###############################################################################
# Templates
###############################################################################
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 81c3363cfbf..56ad0c87c93 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -96,14 +96,11 @@ use vars qw(@parsed_files);
@parsed_files = ();
-sub _read_config_file
+sub _read_config_file($$$)
{
- use File::Basename;
use Cwd;
- my $srcdir = shift;
- my $builddir = shift;
- my $filename = shift;
+ my ($srcdir, $builddir, $filename) = @_;
my @dirlist;
# We need to change our working directory because config.mk files can
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 487d924036c..708c3015e37 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -9,8 +9,11 @@ CONFIGFILE = $(sysconfdir)/smb.conf
PKGCONFIGDIR = $(libdir)/pkgconfig
LMHOSTSFILE = $(sysconfdir)/lmhosts
-PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
- -DBINDIR=\"$(bindir)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \
+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)\" \
@@ -20,6 +23,4 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
-DTORTUREDIR=\"$(TORTUREDIR)\" \
-DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
-dynconfig.o: dynconfig.c Makefile
- @echo Compiling $<
- @$(CC) $(CFLAGS) $(CPPFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@
+