diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-10 22:58:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-10 22:58:03 +0100 |
| commit | 432574366f8a1421680c0e9f67a6dfa7e6d90717 (patch) | |
| tree | bbeb1331cbbd6f4196916858342831d066cc2efd | |
| parent | 84a269410c480f029d6dbd19a7abe41090d6090e (diff) | |
| download | samba-432574366f8a1421680c0e9f67a6dfa7e6d90717.tar.gz samba-432574366f8a1421680c0e9f67a6dfa7e6d90717.tar.bz2 samba-432574366f8a1421680c0e9f67a6dfa7e6d90717.zip | |
Start working on generating .mk file from configure for inclusion in Makefile.
(This used to be commit 091f1e7314f05253ae1c10b3d04557be584ed19f)
| -rw-r--r-- | source4/build/m4/public.m4 | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 4192128bbd..4af246fe47 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -21,13 +21,18 @@ 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 +CFLAGS = $($1_CFLAGS) ENABLE = YES # End Subsystem $1 ################################### @@ -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 +CFLAGS = $($1_CFLAGS) +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 -CFLAGS = $3 -CPPFLAGS = $4 -LDFLAGS = $5 +LIBS = $($1_LIBS) +CFLAGS = $($1_CFLAGS) +CPPFLAGS = $($1_CPPFLAGS) +LDFLAGS = $($1_LDFLAGS) PC_NAME = $6 # End Ext Lib $1 ################################### |