Downloaded from https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kiki-the-nano-bot/debian/patches/Makefile.patch?revision=15681&view=co

Makefile fixes:
 - Make CXXFLAGS, CPPFLAGS, LDFLAGS available for user-specified flags.
 - run SWIG before compiling

Peter De Wachter (pdewacht@gmail.com)
placed in the public domain

--- a/kodilib/linux/Makefile
+++ b/kodilib/linux/Makefile
@@ -21,7 +21,7 @@
 
 INCLUDES = $(KODI_INCLUDES) $(X11_INCLUDES) $(SDL_INCLUDES)
 
-CXXFLAGS = $(INCLUDES) $(SDL_CFLAGS)
+CXXOPTS = -Wall $(INCLUDES) $(SDL_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 
 src =  \
 	$(KODISRCDIR)/handler/KEventHandler.cpp \
@@ -95,4 +95,4 @@
 	$(RM) -f $(obj) libkodi.a
 
 %.o:    %.cpp
-	$(CXX) -c $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(CXXOPTS) -o $@ $<
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -46,7 +46,7 @@
 
 INCLUDES = $(KIKI_INCLUDES) $(X11_INCLUDES) $(PYTHON_INCLUDES)
 
-CXXFLAGS = $(INCLUDES) $(SDLCFLAGS)
+CXXOPTS = -Wall $(INCLUDES) $(SDLCFLAGS) $(CPPFLAGS) $(CXXFLAGS)
 
 src =  \
 	$(KIKISRC)/base/KikiAction.cpp \
@@ -105,8 +105,10 @@
 obj = $(src:.cpp=.o)
 
 kiki: $(KIKISRC)/../SWIG/KikiPy_wrap.cpp $(obj)
-	-(cd ../SWIG; swig -c++ -python -globals kiki -o KikiPy_wrap.cpp KikiPy.i; cp kiki.py ../py)
-	$(CXX) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
+	$(CXX) $(LDFLAGS) $(obj) $(KODILIB) -o kiki $(GLLIBS) $(SDLLIBS) $(PYTHONLIBS)
+
+$(KIKISRC)/../SWIG/KikiPy_wrap.cpp: $(wildcard ../SWIG/*.i)
+	(cd ../SWIG && swig -c++ -python -globals kiki -DSWIG_PYTHON_LEGACY_BOOL -o KikiPy_wrap.cpp KikiPy.i && cp kiki.py ../py)
 
 obj-clean:
 	$(RM) -f $(obj)
@@ -115,5 +117,5 @@
 	$(RM) -f $(obj) kiki
 
 %.o:    %.cpp
-	$(CXX) -c $(CXXFLAGS) -o $@ $<
+	$(CXX) -c $(CXXOPTS) -o $@ $<
 
/option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8365b4a0a3ff110069840191df80a6cb9795f727'>root</a>/<a href='/guix/log/tests?id=8365b4a0a3ff110069840191df80a6cb9795f727'>tests</a>/<a href='/guix/log/tests/records.scm?id=8365b4a0a3ff110069840191df80a6cb9795f727'>records.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/records.scm?id=8365b4a0a3ff110069840191df80a6cb9795f727&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-08-12 12:34:13 +0200'>2021-08-12</span></td><td><a href='/guix/commit/tests/records.scm?id=5291fd7a4205394b863a8705b32fbb447321dc60'>records: Support field sanitizers.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/records.scm (make-syntactic-constructor): Add #:sanitizers.
[field-sanitizer]: New procedure.
[wrap-field-value]: Honor F's sanitizer.
(define-record-type*)[field-sanitizer]: New procedure.
Pass #:sanitizer to 'make-syntactic-constructor'.
* tests/records.scm ("define-record-type* &amp; sanitize")
("define-record-type* &amp; sanitize &amp; thunked"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-04-29 01:22:04 +0200'>2021-04-29</span></td><td><a href='/guix/commit/tests/records.scm?id=524c9800afb433cc474132185d8e37f72004adb3'>diagnostics, ui: Adjust to 'read-error' and 'syntax-error' in Guile 3.0.6.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/diagnostics.scm (source-properties-&gt;location): Add clause for
vectors.
* guix/ui.scm (report-load-error): Tweak 'read-error' handling for 3.0.6.
* tests/guix-package.sh: Relax regexp for the "unbound variable"
diagnostic check.
* tests/guix-system.sh: Adjust "missing closing paren" check for 3.0.6.
* tests/records.scm (location-alist): New procedure.
("define-record-type* &amp; wrong field specifier")
("define-record-type* &amp; wrong field specifier, identifier")
("define-record-type* &amp; duplicate initializers"): Use it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-16 18:30:57 +0100'>2020-01-16</span></td><td><a href='/guix/commit/tests/records.scm?id=47212fc763788660ff9051ccee1f6fa8a0db7bdd'>records: Improve reporting of "invalid field specifier" errors.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously users would just see:

  error: invalid field specifier

without source location or hints.

* guix/records.scm (expand): Add optional 'parent-form' parameter and
pass it to 'syntax-violation' when it is true.
(make-syntactic-constructor): Pass S as a third argument to
'report-invalid-field-specifier'.
* guix/ui.scm (report-load-error): For 'syntax-error', show SUBFORM or
FORM in the message.
* tests/records.scm ("define-record-type* &amp; wrong field specifier"): Add
a 'subform' parameter and adjust test accordingly.
("define-record-type* &amp; wrong field specifier, identifier"): New test.
* tests/guix-system.sh: Add test.
</span></span></td><td>Ludovic Courtès</td></tr>