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 $@ $<
 
ut 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=478880c4a95730e1b024e13602de6094e6b70f2f'>root</a>/<a href='/guix/log/po?id=478880c4a95730e1b024e13602de6094e6b70f2f'>po</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/po?id=478880c4a95730e1b024e13602de6094e6b70f2f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-24 10:11:38 +0200'>2019-09-24</span></td><td><a href='/guix/commit/po?id=11da634a6e64afa2904542e2174aa2a185f9ac3a'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-21 16:48:36 +0200'>2019-09-21</span></td><td><a href='/guix/commit/po?id=aeb51370da7c854e8167066df9b138e15d7363e6'>guix package: Add 'guix show' alias.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/show.scm: New file.
* Makefile.am (MODULES): Add it.
* po/guix/POTFILES.in: Add it.
* tests/guix-package-aliases.sh: Add test.
* doc/guix.texi (Invoking guix package): Document it and use it in a example.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>zimoun</td></tr>
<tr><td><span title='2019-09-18 11:38:14 +0200'>2019-09-18</span></td><td><a href='/guix/commit/po?id=7bc46ecc34ceb042ff890e5d306d0a2a736e891d'>doc: Add Guix Cookbook.</a><span class='msg-avail'>...<span class='msg-tooltip'>* .gitignore: Update ignore list.
* Makefile.am (assert-no-store-file-names): Exclude the cookbook.
* bootstrap: Generate po files for cookbook translations.
* doc/guix-cookbook.texi: New file.
* doc/local.mk (info_TEXINFOS): Add it; add a rule to build cookbook
translations.
* po/doc/local.mk (DOC_COOKBOOK_PO_FILES): New variable.
(EXTRA_DIST): Add cookbook pot file and po files.
(doc-po-update-cookbook-%): New target.
(doc-pot-update): Also update cookbook pot file.
(doc-po-update): Also update cookbook po files.
</span></span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-09-06 20:46:00 -0400'>2019-09-06</span></td><td><a href='/guix/commit/po?id=65542a8852759f35e19959149ac92297c8b54be5'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2019-08-31 21:30:09 +0200'>2019-08-31</span></td><td><a href='/guix/commit/po?id=e60a3e74400efc9149083708e3369f1eeb6cb6d6'>nls: Update 'fr' translation of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2019-08-31 21:29:46 +0200'>2019-08-31</span></td><td><a href='/guix/commit/po?id=b212fef4b076faccdd36335c728fd71321778716'>nls: Update 'es' translation of the manual.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2019-08-29 17:19:18 -0400'>2019-08-29</span></td><td><a href='/guix/commit/po?id=0481289cbccba2646bf654f0ae49ac9c45602d5d'>Merge branch 'master' into core-updates</a></td><td>Mark H Weaver</td></tr>
<tr><td><span title='2019-08-25 22:48:41 +0200'>2019-08-25</span></td><td><a href='/guix/commit/po?id=a4915e14631e68202c96af41578de63b1b1581e0'>nls: Update 'sv' translation.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-08-25 22:48:41 +0200'>2019-08-25</span></td><td><a href='/guix/commit/po?id=127a07152fa4f36e073ecdd216adae8200b6a049'>nls: Update 'de' translation.</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-08-25 22:48:41 +0200'>2019-08-25</span></td><td><a href='/guix/commit/po?id=3bbd30e9b011d6f41e05de362c52c828bc07c8b5'>nls: Update 'fr' translation.</a></td><td>Ludovic Courtès</td></tr>