Move CFLAGS overrides for SWIG modules to Makefile.

(This used to be commit 58665a8a8e4b10435aebbf2c95b6a8e50db232d6)

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 0162653076039691f5a96c2cc795198d33fdd531..78a267ced17bd0ca4947aa582eec1ba2c1c2cba5 100644 (file)
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -44,3 +44,5 @@ SWIG_FILE = auth.i
 $(eval $(call python_py_module_template,auth.py,$(authsrcdir)/auth.py))
 
 swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o
+
+$(swig_auth_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index fc01f7eddc6f9b8fcf3e9a843ff6b64dc6ae391a..18cf460179e4c51fd2ca15380f4757b8e29c2671 100644 (file)
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -20,3 +20,5 @@ SWIG_FILE = credentials.i
 $(eval $(call python_py_module_template,credentials.py,$(authsrcdir)/credentials/credentials.py))
 
 swig_credentials_OBJ_FILES = $(authsrcdir)/credentials/credentials_wrap.o
+
+$(swig_credentials_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 75a02ca8c257abdefa90778111386bfb21962f88..c4c8f0de135aea9073c67cf9ebc914289b5cd844 100644 (file)
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -146,8 +146,6 @@ sub check_python($$$)
                $dirname = "" if $dirname eq "./";
 
                $python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
-               push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)");
-               push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_CAST_QUAL)");
                $python->{INIT_FUNCTION} = "{ (char *)\"_$basename\", init_$basename }";
        } else {
                my $basename = $python->{NAME};

diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index e4b5f40571f26d135cca00ea19d66343e910e204..3e5a5e2a2f84ce825113cc6e83a923010483b6aa 100644 (file)
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -58,3 +58,5 @@ PRIVATE_DEPENDENCIES = LIBEVENTS LIBSAMBA-HOSTCONFIG
 swig_events_OBJ_FILES = $(libeventssrcdir)/events_wrap.o
 
 $(eval $(call python_py_module_template,events.py,$(libeventssrcdir)/events.py))
+
+$(swig_events_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index aeafb830d6512b94660a1703afdce7e355f383bb..77af5d6183f5f54f6c4b76fbf0702b3edece1711 100644 (file)
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -6,3 +6,5 @@ SWIG_FILE = ldb.i
 swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
 
 $(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py))
+
+$(swig_ldb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index bb939be0c5f7e2e3e72d28f5cd5f3a0772beaa5e..077d96ab30b11212fcf7c3dec254f78a14748c54 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -111,3 +111,5 @@ SWIG_FILE = registry.i
 swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
 
 $(eval $(call python_py_module_template,registry.py,lib/registry/registry.py))
+
+$(swig_registry_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/lib/tdb/python.mk b/source4/lib/tdb/python.mk
index 51074c85766e90df29d6eae699cdb7667fdbed5c..1be237186ff6c9f0a482a9c582bc01e23d9b8862 100644 (file)
--- a/source4/lib/tdb/python.mk
+++ b/source4/lib/tdb/python.mk
@@ -5,3 +5,6 @@ PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
 swig_tdb_OBJ_FILES = lib/tdb/tdb_wrap.o
 
 $(eval $(call python_py_module_template,tdb.py,lib/tdb/tdb.py))
+
+$(swig_tdb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index d7e4e143c07d5a71d4f7488e3d8e2bede6e6c52b..54a5e48e73025687cbfc9c75c2cbea47abbeb318 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -82,6 +82,8 @@ python_libcli_nbt_OBJ_FILES = $(libclisrcdir)/swig/libcli_nbt_wrap.o
 
 $(eval $(call python_py_module_template,libcli_nbt.py,$(libclisrcdir)/swig/libcli_nbt.py))
 
+$(python_libcli_nbt_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+
 [PYTHON::python_libcli_smb]
 SWIG_FILE = swig/libcli_smb.i
 PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG
@@ -90,6 +92,9 @@ python_libcli_smb_OBJ_FILES = $(libclisrcdir)/swig/libcli_smb_wrap.o
 
 $(eval $(call python_py_module_template,libcli_smb.py,$(libclisrcdir)/swig/libcli_smb.py))
 
+$(python_libcli_smb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+
+
 [SUBSYSTEM::LIBCLI_DGRAM]
 PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON
 

diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 9f704e9592e71323c3b6c27a174e8052998aca05..4d46734059216c93ab674eaf876554fe2ae90891 100644 (file)
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -14,3 +14,5 @@ PRIVATE_DEPENDENCIES = LIBSECURITY
 swig_security_OBJ_FILES = $(libclisrcdir)/security/security_wrap.o
 
 $(eval $(call python_py_module_template,security.py,$(libclisrcdir)/security/security.py))
+
+$(swig_security_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 5ef64d6b75fafbdd7c42f4b79cdbaa8320f410b6..fc11946bebaad7ad5463e95723a990c9fbc2b98e 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -729,6 +729,8 @@ swig_dcerpc_OBJ_FILES = $(dcerpcsrcdir)/dcerpc_wrap.o
 
 $(eval $(call python_py_module_template,dcerpc.py,$(dcerpcsrcdir)/dcerpc.py))
 
+$(swig_dcerpc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+
 [PYTHON::python_echo]
 PRIVATE_DEPENDENCIES = RPC_NDR_ECHO PYTALLOC param swig_credentials 
 

diff --git a/source4/param/config.mk b/source4/param/config.mk
index 74b19d3d1d64eaef2d0850edd6f5b2e9ad50e1a8..5d14d2254454ca060c7af51cadcfba15724a64f9 100644 (file)
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -64,3 +64,5 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG
 param_OBJ_FILES = $(paramsrcdir)/param_wrap.o
 
 $(eval $(call python_py_module_template,param.py,$(paramsrcdir)/param.py))
+
+$(param_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 1fa273e99d33fddaba87bfb6df4f0fa8a693d7cc..cc94abb702f8c2598fab1738eab3b25938533025 100644 (file)
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,6 +21,8 @@ SWIG_FILE = misc.i
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
+$(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+
 _PY_FILES = $(shell find $(pyscriptsrcdir) -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))