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 $@ $<
 
itter'>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=6d09227e1f84d8be9d7cbe1e39cc47c5bb12fe29'>root</a>/<a href='/guix/log/tests?id=6d09227e1f84d8be9d7cbe1e39cc47c5bb12fe29'>tests</a>/<a href='/guix/log/tests/gem.scm?id=6d09227e1f84d8be9d7cbe1e39cc47c5bb12fe29'>gem.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/gem.scm?id=6d09227e1f84d8be9d7cbe1e39cc47c5bb12fe29&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-17 19:09:27 +0200'>2022-09-17</span></td><td><a href='/guix/commit/tests/gem.scm?id=5d22261db3d5099d745b9e8c8484545e546b319e'>import: gem: Support importing a specific version of a gem.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/gem.scm: (rubygems-fetch, gem-&gt;guix-package)
(gem-recursive-import): Fix to fetch the specified version of the gem.
* guix/scripts/import/gem.scm (show-help): Update the help message.
(guix-import-gem): Modify so the version number to be passed to subsequent
procedures.
* tests/gem.scm: Add tests.
* doc/guix.texi (Invoking guix import): Document.

Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Taiju HIGASHI</td></tr>
<tr><td><span title='2021-07-20 23:43:29 +0200'>2021-07-20</span></td><td><a href='/guix/commit/tests/gem.scm?id=fa7db21f5973bf3de06ec6418d230b1969d479a1'>import: gem: Emit new-style package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/gem.scm (make-gem-sexp): Wrap inputs in 'list' instead of
'quasiquote'.
* tests/gem.scm ("gem-&gt;guix-package")
("gem-recursive-import"): Adjust accordingly.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Sarah Morgensen</td></tr>
<tr><td><span title='2020-04-27 23:29:40 +0200'>2020-04-27</span></td><td><a href='/guix/commit/tests/gem.scm?id=5dfe02c60767a633c67f7f6fc9557b54b3c99b63'>tests: Remove trailing commas in JSON tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>These commas are rejected by Guile-JSON 3.5.0.

* tests/crate.scm (test-foo-dependencies)
(test-root-dependencies, test-intermediate-1-dependencies)
(test-intermediate-2-dependencies): Remove trailing commas.
* tests/gem.scm (test-bar-json): Likewise.
* tests/pypi.scm (test-json): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-02-05 16:18:58 +0100'>2020-02-05</span></td><td><a href='/guix/commit/tests/gem.scm?id=c24fe4a52057ea3390faf59fd672a617eff34aea'>import: gem: Deal with unavailable licensing info.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/39404&gt;.
Reported by Seth &lt;lee.seth@tuta.io&gt;.

* guix/import/gem.scm (&lt;gem&gt;)[licenses]: Adjust for non-vector
licenses.
* tests/gem.scm (test-bar-json): Change "licenses" to 'null'.
("gem-recursive-import"): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-11 12:13:03 +0100'>2019-12-11</span></td><td><a href='/guix/commit/tests/gem.scm?id=70a8e13277d4a44b89dd9ee2290b98105f0235f1'>import: utils: 'recursive-import' returns a list rather than a stream.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/utils.scm (recursive-import): Remove 'list-&gt;stream' call.
* guix/scripts/import/cran.scm (guix-import-cran): Remove 'stream-&gt;list'
call.
* guix/scripts/import/crate.scm (guix-import-crate): Likewise.
* guix/scripts/import/elpa.scm (guix-import-elpa): Likewise.
* guix/scripts/import/gem.scm (guix-import-gem): Likewise.
* guix/scripts/import/hackage.scm (guix-import-hackage): Likewise.
* guix/scripts/import/opam.scm (guix-import-opam): Likewise.
* guix/scripts/import/pypi.scm (guix-import-pypi): Likewise.
* guix/scripts/import/stackage.scm (guix-import-stackage): Likewise.
* tests/gem.scm ("gem-recursive-import"): Likewise.
* tests/import-utils.scm ("recursive-import"): Likewise.

Co-authored-by: Brian Leung &lt;bkleung89@gmail.com&gt;
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-12-11 12:12:58 +0100'>2019-12-11</span></td><td><a href='/guix/commit/tests/gem.scm?id=ddd59159004ca73c9449a27945116ff5069c3743'>import: utils: 'recursive-import' returns packages in topological order.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/utils.scm (topological-sort): New procedure.
(recursive-import): Rewrite to use it.
* tests/import-utils.scm ("recursive-import"): New test.
* guix/import/cran.scm (cran-&gt;guix-package): Always return two values.
* guix/scripts/import/cran.scm (guix-import-cran): Remove 'reverse' call
on 'cran-recursive-import' result.
* guix/scripts/import/crate.scm (guix-import-crate): Likewise.
* guix/scripts/import/elpa.scm (guix-import-elpa): Likewise.
* guix/scripts/import/gem.scm (guix-import-gem): Likewise.
* guix/scripts/import/hackage.scm (guix-import-hackage): Likewise.
* guix/scripts/import/opam.scm (guix-import-opam): Likewise.
* guix/scripts/import/pypi.scm (guix-import-pypi): Likewise.
* guix/scripts/import/stackage.scm (guix-import-stackage): Likewise.
* tests/gem.scm ("gem-recursive-import"): Change the order of package
expressions accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>