mirror of
https://github.com/openwrt/telephony.git
synced 2025-12-22 01:44:35 +04:00
a34590f057
- patches which are now upstream were removed - some patches were refreshed - 003-modmake-fix.patch was amended a bit because of upstream commit 91f12b5 (it changed tests/unit/Makefile.am so that it doesn't redefine AM_CFLAGS and AM_CPPFLAGS, which results in duplicated flags) Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
21 lines
884 B
Diff
21 lines
884 B
Diff
--- a/build/modmake.rulesam
|
|
+++ b/build/modmake.rulesam
|
|
@@ -1,8 +1,8 @@
|
|
AUTOMAKE_OPTIONS = foreign subdir-objects
|
|
AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
|
|
-AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
|
|
+AM_CPPFLAGS = $(SWITCH_AM_CPPFLAGS)
|
|
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
|
|
-DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
|
|
+DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
|
|
DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic
|
|
|
|
moddir=@modulesdir@
|
|
@@ -18,4 +18,4 @@ extraclean-modules: extraclean
|
|
print_tests:
|
|
@set +e; \
|
|
test -z "$(TESTS)" || for i in $(TESTS); do echo $(subdir)/$$i; done;
|
|
-
|
|
\ No newline at end of file
|
|
+
|