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 $@ $<
 
ption value='author'>author</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=38e4d5956f8d585b1c0263a1a6c79e749d7e7c90'>root</a>/<a href='/guix/log/gnu?id=38e4d5956f8d585b1c0263a1a6c79e749d7e7c90'>gnu</a>/<a href='/guix/log/gnu/packages?id=38e4d5956f8d585b1c0263a1a6c79e749d7e7c90'>packages</a>/<a href='/guix/log/gnu/packages/gimp.scm?id=38e4d5956f8d585b1c0263a1a6c79e749d7e7c90'>gimp.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/gnu/packages/gimp.scm?id=38e4d5956f8d585b1c0263a1a6c79e749d7e7c90&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-03-17 16:37:27 +0100'>2018-03-17</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=c695fb769c94623371c5997da1dc454b0a4f58a8'>gnu: Fix common unquote typos.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-01-21 02:53:14 +0100'>2018-01-21</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=8f890fed343f146a7db71114b885a6f3a8df24ad'>gnu: babl: Update to 0.1.40.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-01-21 02:53:14 +0100'>2018-01-21</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=9d2e56d0afb97096d9c70ab6179e970f7de45a16'>gnu: babl: Parameterise source URI.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-01-21 02:53:13 +0100'>2018-01-21</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=0c8ac76cfe04dc2cf49531a7580210e5c4bb5487'>gnu: babl: Edit description.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-12-31 13:51:20 -0500'>2017-12-31</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=2a74f6f7e72c0bc420316d0d7cfb72bdcaedf414'>gnu: gimp: Fix CVE-2017-{17784,17785,17786,17787,17789}.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-12-20 01:40:14 -0500'>2017-12-20</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=afcbc348a31f576cc87a573ef7ba61b116ec760a'>gnu: babl: Update to 0.1.38.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-08-27 15:07:21 +0200'>2017-08-27</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=997856746019ff4f6e0dcc66cd1ac647f4e5a4aa'>gnu: babl: Update to 0.1.30.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-08-08 18:43:07 +0300'>2017-08-08</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=65831c6425bf9e82c665f2fe4d0803a483f888a1'>gnu: babl: Update to 0.1.28.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-08-08 18:43:05 +0300'>2017-08-08</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=3616ff51b33b94c388413f9a2790cab7bbbe8e72'>gnu: gegl: Use 'modify-phases' syntax.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2017-08-08 18:43:03 +0300'>2017-08-08</span></td><td><a href='/guix/commit/gnu/packages/gimp.scm?id=b0a21b56db6c0e0db3cf5183509f860bae697712'>gnu: gegl: Fix building on aarch64.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>
 +0200'>2017-05-09</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=f8ff364ab77a92951b54eedb0c985f5b498206e0'>gnu: re2: Update to 2017-05-01.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-05-07 17:35:07 +0200'>2017-05-07</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=7a4a64e99e65e96a4dc3e65ae691b4c80b7642e8'>gnu: re2: Add missing '#:modules' imports.</a><span class='msg-avail'>...</span></td><td>Sergei Trofimovich</td></tr>
<tr><td><span title='2017-04-06 15:07:55 +0200'>2017-04-06</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=2aa78c8f04660fbbca9fc57ecee19788ee6f4e32'>gnu: re2: Update to 2017-04-01.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-03-11 22:23:28 +0100'>2017-03-11</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=612af7ff66e0d5018bb696ff0140805bc8b5194e'>gnu: re2: Set CXX for cross-compilation.</a><span class='msg-avail'>...</span></td><td>Sergei Trofimovich</td></tr>
<tr><td><span title='2017-03-01 20:41:41 +0100'>2017-03-01</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=8c58c53beba33beefd657f466d2ba758f2096a08'>gnu: re2: Update to 2017-03-01.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-01-30 14:55:10 +0100'>2017-01-30</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=4a9c4a55acd2554e39d91fb2a0f87f9107f28194'>gnu: re2: Update to 2017-01-01.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-11-02 05:34:09 +0000'>2016-11-02</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=24dfc13bfadf53e85253445870fc18c2fc37b6bf'>gnu: re2: Update to 2016-11-01.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2016-09-12 16:38:03 +0300'>2016-09-12</span></td><td><a href='/guix/commit/gnu/packages/regex.scm?id=ac8a6428867086b1091d8a1f4b21b1e321531256'>gnu: tre: Move to (gnu packages regex).</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>