Fix some syntax errors.

(This used to be commit 906148bf87ae278c6f6232675bd6aaf4d1e33e6c)

diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index d01ff73ee94fd57ad5d3e70d7859385cccb1a102..146f004397c4079d863847d2f3dc9ef638e3c71c 100644 (file)
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -7,7 +7,7 @@ PUBLIC_DEPENDENCIES = \
 PRIVATE_DEPENDENCIES = \
                SECRETS
 
-CREDENTIALS_OBJ_FILES = $(addprefix auth/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
+CREDENTIALS_OBJ_FILES = $(addprefix auth/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
 
 PUBLIC_HEADERS += $(addprefix auth/credentials/, credentials.h credentials_krb5.h)
 

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index cfa62e1c14c4c58d5105bb8bc0e9396c30f24c72..1f32f5ecd3e1cbc7dccf571683c5bc6fa9b42fb9 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -11,7 +11,7 @@ PUBLIC_DEPENDENCIES = \
 #################################
 
 
-gensec_OBJ_LIST = $(addprefix auth/, gensec.o socket.o)
+gensec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
 
 PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
 

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 3d66c6bcfba290eb93baf088d3d09a261fbd5db6..27491a7e9e983a171c8cb4d56567730b9f102910 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -23,12 +23,11 @@ sub new($$$)
 
        $self->{output} = "";
 
-       $self->{mkfile} = $mkfile;
-
        $self->output("################################################\n");
        $self->output("# Autogenerated by build/smb_build/makefile.pm #\n");
        $self->output("################################################\n");
        $self->output("\n");
+       $self->output($mkfile);
 
        return $self;
 }
@@ -293,8 +292,6 @@ sub write($$)
 
        $self->_prepare_mk_files();
 
-       $self->output($self->{mkfile});
-
        open(MAKEFILE,">$file") || die ("Can't open $file\n");
        print MAKEFILE $self->{output};
        close(MAKEFILE);

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index e7c5f9bd743bf800c69bcb9a88e4c2a89f96311d..d6a340a5995a7dff2f32b0f5655eeb870c9ddd75 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -19,7 +19,7 @@ LIBCLI_LSA_OBJ_FILES = libcli/util/clilsa.o
 PRIVATE_PROTO_HEADER = composite/proto.h
 PUBLIC_DEPENDENCIES = LIBEVENTS
 
-LIBCLI_COMPOSITE_OBJ_FILES = libcli/util/composite.o
+LIBCLI_COMPOSITE_OBJ_FILES = libcli/composite/composite.o
 
 [SUBSYSTEM::LIBCLI_SMB_COMPOSITE]
 PRIVATE_PROTO_HEADER = smb_composite/proto.h
@@ -96,7 +96,7 @@ LIBCLI_RESOLVE_OBJ_FILES = libcli/resolve/resolve.o
 PRIVATE_PROTO_HEADER = resolve/lp_proto.h
 PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-CONFIG LIBNETIF 
 
-LP_RESOLVE_OBJ_FILES = $(addprefix libcli/resolve, \
+LP_RESOLVE_OBJ_FILES = $(addprefix libcli/resolve/, \
                                          bcast.o nbtlist.o wins.o \
                                          host.o resolve_lp.o)
 

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index e854ded2719e64190a7fdd560eda40844fd758df..5d7a5f23a9470009f16b61bbc312d32d1ffdbf80 100644 (file)
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -57,7 +57,7 @@ PRIVATE_DEPENDENCIES = \
 # End MODULE dcerpc_srvsvc
 ################################################
 
-dcerpc_srvsvc_OBJ_FILES = $(addprefix rpc-server/srvsvc/, dcesrv_srvsvc.o srvsvc_ntvfs.o)
+dcerpc_srvsvc_OBJ_FILES = $(addprefix rpc_server/srvsvc/, dcesrv_srvsvc.o srvsvc_ntvfs.o)
 
 ################################################
 # Start MODULE dcerpc_wkssvc