diff --git a/make/swig.mk b/make/swig.mk
index 6b1e4716..c9ffc113 100644
--- a/make/swig.mk
+++ b/make/swig.mk
@@ -98,6 +98,11 @@ SWIG_WRAPPER_DEP_MK           = swig.dep.mk
 SWIG_INSTALLED_SO             = $(addprefix $(INSTALL_LIBDIR)/,$(SWIG_MODULE_SO))
 SWIG_INSTALLED_MODULE_TARGET  = $(addprefix $(SWIG_MODULE_TARGET_DIR)/,$(SWIG_MODULE_TARGET))
 
+SWIG_DEFINES                 += -DNON_C_BINDING
+SWIG_OPTS                    += $(SWIG_DEFINES)
+LOCAL_CFLAGS                 += $(SWIG_DEFINES)
+LOCAL_CPPFLAGS               += $(SWIG_DEFINES)
+
 # for depend.mk
 OBJ                           = $(SWIG_OBJ)
 DEPEND_MK                    += $(SWIG_WRAPPER_DEP_MK)
diff --git a/make/topdir.mk b/make/topdir.mk
index b002aebb..22e8f691 100644
--- a/make/topdir.mk
+++ b/make/topdir.mk
@@ -158,5 +158,8 @@ prefix.done:
 echo-prereq-build:
 	@python $(MOD_SCRIPT_DIR)/projects.py --topdir . $(PROJECTS_PY_EXTRA_ARGS) required-pkg $(RPM_PROJECT)
 
-echo-files:
+list-files echo-files:
 	@$(LIST_VCS_FILES) -f
+
+list-text-files echo-text-files:
+	@$(LIST_VCS_FILES) -ft