From 78f804c497249cc807d8f2d7ac914288b3739c49 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 18 May 2008 21:10:09 +0200
Subject: Typo, formatting fixes. (This used to be commit
 5c961c0b41e0a41bd41705a103595af7405132a4)

---
 source4/auth/ntlmssp/config.mk      |  2 +-
 source4/build/make/templates.mk     |  4 +++-
 source4/build/smb_build/makefile.pm |  4 ++--
 source4/dynconfig.mk                | 11 ++++++-----
 4 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'source4')

diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 9909e3e0bb..3400ee2aeb 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 3a1f5656a6..01afb3f2fb 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/makefile.pm b/source4/build/smb_build/makefile.pm
index 4c375cecf6..db8ba4b604 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -227,9 +227,9 @@ sub ProtoHeader($$)
 {
 	my ($self,$ctx) = @_;
 
-	my $target = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
+	my $target = "\$(addprefix $ctx->{BASEDIR}/,$ctx->{PRIVATE_PROTO_HEADER})";
 	$self->output("PROTO_HEADERS += $target\n");
-	$self->output("\$(call proto_header_template, $target, \$($ctx->{NAME}_OBJ_FILES:.o=.c))\n");
+	$self->output("\$(call proto_header_template,$target,\$($ctx->{NAME}_OBJ_FILES:.o=.c))\n");
 }
 
 sub write($$)
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 487d924036..708c3015e3 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 $@
+
-- 
cgit