Move some variables to a separate .mk file that could also be included by a non-smb_b...
authorJelmer Vernooij <jelmer@samba.org>
Sun, 10 Feb 2008 22:32:31 +0000 (23:32 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 10 Feb 2008 22:32:31 +0000 (23:32 +0100)
source/build/m4/public.m4
source/build/smb_build/makefile.pm
source/configure.ac

index 4af246fe477e3795d8bf4ce9c903717b8779623c..467b63055c5c1f58ed74df95db4aeacf43dec0f8 100644 (file)
@@ -30,9 +30,9 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
 @<:@SUBSYSTEM::$1@:>@
-OBJ_FILES = $($1_OBJ_FILES)
+OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
-CFLAGS = $($1_CFLAGS)
+CFLAGS = $4
 ENABLE = YES
 # End Subsystem $1
 ###################################
@@ -52,12 +52,12 @@ SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
 ###################################
 # Start Library $1
 @<:@LIBRARY::$1@:>@
-OBJ_FILES = $($1_OBJ_FILES)
+OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
 VERSION = $4
 SO_VERSION = $5 
-CFLAGS = $($1_CFLAGS)
-LDFLAGS = $($1_LDFLAGS)
+CFLAGS = $6
+LDFLAGS = \$($1_LDFLAGS)
 PC_NAME = $8
 ENABLE = YES
 # End Library $1
@@ -149,10 +149,10 @@ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 ###################################
 # Start Ext Lib $1
 @<:@EXT_LIB::$1@:>@
-LIBS = $($1_LIBS)
-CFLAGS = $($1_CFLAGS)
-CPPFLAGS = $($1_CPPFLAGS)
-LDFLAGS = $($1_LDFLAGS)
+LIBS = \$($1_LIBS)
+CFLAGS = $3
+CPPFLAGS = $4
+LDFLAGS = \$($1_LDFLAGS)
 PC_NAME = $6
 # End Ext Lib $1
 ###################################
index 5799d89c5701ca620fccb2688dbed4c16bfe11a8..dfa7387c753d6a1b99c4cb87b130f1ea1994da91 100644 (file)
@@ -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");
 
index ed74bc1251ffa70d553c32593f1ef194c05470d7..0857c68426084e574a8d56fd5d90bf84d4b1dab7 100644 (file)
@@ -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