diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-10 23:32:31 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-10 23:32:31 +0100 |
| commit | 73be46cf452165555a85986029bf3011120a2b51 (patch) | |
| tree | ede622c9e33f79ceccb400a72d18e9cc1b1418d1 | |
| parent | 432574366f8a1421680c0e9f67a6dfa7e6d90717 (diff) | |
| download | samba-73be46cf452165555a85986029bf3011120a2b51.tar.gz samba-73be46cf452165555a85986029bf3011120a2b51.tar.bz2 samba-73be46cf452165555a85986029bf3011120a2b51.zip | |
Move some variables to a separate .mk file that could also be included by a non-smb_build build system.
(This used to be commit f44b838b682760e54aa981fe2e991495395d2394)
| -rw-r--r-- | source4/build/m4/public.m4 | 18 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 1 | ||||
| -rw-r--r-- | source4/configure.ac | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 4af246fe47..467b63055c 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -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 ################################### diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 5799d89c57..dfa7387c75 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/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/source4/configure.ac b/source4/configure.ac index ed74bc1251..0857c68426 100644 --- a/source4/configure.ac +++ b/source4/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 |