[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-702-gf44b838

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  f44b838b682760e54aa981fe2e991495395d2394 (commit)
       via  091f1e7314f05253ae1c10b3d04557be584ed19f (commit)
      from  ea718a0c0b1efd73020da6d5a362b371afd8e371 (commit)

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


- Log -----------------------------------------------------------------
commit f44b838b682760e54aa981fe2e991495395d2394
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Feb 10 23:32:31 2008 +0100

    Move some variables to a separate .mk file that could also be included by a non-smb_build build system.

commit 091f1e7314f05253ae1c10b3d04557be584ed19f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Feb 10 22:58:03 2008 +0100

    Start working on generating .mk file from configure for inclusion in Makefile.

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

Summary of changes:
 source/build/m4/public.m4          |   27 ++++++++++++++++++++++-----
 source/build/smb_build/makefile.pm |    1 +
 source/configure.ac                |    8 ++++++++
 3 files changed, 31 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index 4192128..467b630 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -21,11 +21,16 @@ dnl #######################################################
 dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
+MAKE_SETTINGS="$MAKE_SETTINGS
+$1_OBJ_FILES = $2
+$1_CFLAGS = $4
+"
+
 SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
 @<:@SUBSYSTEM::$1@:>@
-OBJ_FILES = $2
+OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
 CFLAGS = $4
 ENABLE = YES
@@ -37,16 +42,22 @@ ENABLE = YES
 dnl SMB_LIBRARY(name,obj_files,required_subsystems,version,so_version,cflags,ldflags,pcname)
 AC_DEFUN([SMB_LIBRARY],
 [
+MAKE_SETTINGS="$MAKE_SETTINGS
+$1_OBJ_FILES = $2
+$1_CFLAGS = $6
+$1_LDFLAGS = $7
+"
+
 SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
 ###################################
 # Start Library $1
 @<:@LIBRARY::$1@:>@
-OBJ_FILES = $2
+OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
 VERSION = $4
 SO_VERSION = $5 
 CFLAGS = $6
-LDFLAGS = $7
+LDFLAGS = \$($1_LDFLAGS)
 PC_NAME = $8
 ENABLE = YES
 # End Library $1
@@ -127,15 +138,21 @@ include $1
 dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags,pcname)
 AC_DEFUN([SMB_EXT_LIB],
 [
+MAKE_SETTINGS="$MAKE_SETTINGS
+$1_LIBS = $2
+$1_CFLAGS = $3
+$1_CPPFLAGS = $4
+$1_LDFLAGS = $5
+"
 
 SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 ###################################
 # Start Ext Lib $1
 @<:@EXT_LIB::$1@:>@
-LIBS = $2
+LIBS = \$($1_LIBS)
 CFLAGS = $3
 CPPFLAGS = $4
-LDFLAGS = $5
+LDFLAGS = \$($1_LDFLAGS)
 PC_NAME = $6
 # End Ext Lib $1
 ###################################
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 5799d89..dfa7387 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -46,6 +46,7 @@ sub new($$$)
 	$self->output("# Autogenerated by build/smb_build/makefile.pm #\n");
 	$self->output("################################################\n");
 	$self->output("\n");
+	$self->output("include mkconfig.mk\n");
 
 	$self->output("default: all\n\n");
 
diff --git a/source/configure.ac b/source/configure.ac
index ed74bc1..0857c68 100644
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -201,3 +201,11 @@ CMP_RET=$?
 if test $CMP_RET != 0; then
 	cp include/config_tmp.h include/config.h
 fi
+
+echo "configure: creating mkconfig.mk"
+cat >mkconfig.mk<<CEOF
+# mkconfig.mk - Autogenerated by configure, DO NOT EDIT!
+dnl AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [
+dnl AC_Var = $AC_Var])
+$MAKE_SETTINGS
+CEOF


-- 
Samba Shared Repository