[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-704-ga72d3ff

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  a72d3ffaded5624732972708c305b8f84f47fed7 (commit)
      from  a22bb7725b0b825a90e955f883a34341e9f0f69e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit a72d3ffaded5624732972708c305b8f84f47fed7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 01:02:16 2008 +0100

    Move some more variables to static .mk file.

-----------------------------------------------------------------------

Summary of changes:
 source/build/smb_build/makefile.pm |   16 +++-------------
 source/main.mk                     |    6 ++++++
 2 files changed, 9 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index c28229c..865d231 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -92,17 +92,7 @@ CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -I\
 
 INSTALL_LINK_FLAGS=$extra_link_flags
 
-BNLD=$self->{config}->{LD} 
-BNLD_FLAGS=$self->{config}->{LDFLAGS} -L$libdir
-
-SHLD_FLAGS=$self->{config}->{SHLD_FLAGS} -L\$(builddir)/bin/shared
-
-MDLD_FLAGS=$self->{config}->{MDLD_FLAGS} -L\$(builddir)/bin/shared
-
-HOSTCC_FLAGS=-D_SAMBA_HOSTCC_ \$(CFLAGS)
-
-HOSTLD_FLAGS=$self->{config}->{LDFLAGS}
-
+INTERN_LDFLAGS = -L$libdir
 __EOD__
 );
 }
@@ -245,7 +235,7 @@ __EOD__
 $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
 	\@mkdir -p $ctx->{SHAREDDIR}
-	\@\$(MDLD) \$(MDLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+	\@\$(MDLD) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS)
 __EOD__
@@ -303,7 +293,7 @@ sub SharedLibrary($$)
 $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)
 	\@echo Linking \$\@
 	\@mkdir -p $ctx->{SHAREDDIR}
-	\@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+	\@\$(SHLD) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) \\
 		\$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\
 		$soarg$lns
diff --git a/source/main.mk b/source/main.mk
index 0f492c1..f7ef4b4 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -7,6 +7,12 @@ JSDIR = $(datadir)/js
 SETUPDIR = $(datadir)/setup
 NCALRPCDIR = $(localstatedir)/ncalrpc
 
+BNLD = $(LD)
+BNLD_FLAGS = $(LDFLAGS)
+
+HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
+HOSTLD_FLAGS = $(LDFLAGS)
+
 default: all
 
 include dynconfig.mk


-- 
Samba Shared Repository