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 $@ $<
 
ion>
<option 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=c57ec6ed1ee5f2367833c3e11ae7074f114dbf02&amp;ofs=50'>root</a>/<a href='/guix/log/gnu?id=c57ec6ed1ee5f2367833c3e11ae7074f114dbf02&amp;ofs=50'>gnu</a>/<a href='/guix/log/gnu/services?id=c57ec6ed1ee5f2367833c3e11ae7074f114dbf02&amp;ofs=50'>services</a>/<a href='/guix/log/gnu/services/base.scm?id=c57ec6ed1ee5f2367833c3e11ae7074f114dbf02&amp;ofs=50'>base.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/services/base.scm?id=c57ec6ed1ee5f2367833c3e11ae7074f114dbf02&amp;ofs=50&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-11 21:42:04 -0400'>2020-07-11</span></td><td><a href='/guix/commit/gnu/services/base.scm?id=ea4915a74bc4c03495d4910c1e32a92c790b6626'>services: guix: Refer to 'berlin.guix.gnu.org.pub'.</a><span class='msg-avail'>...<span class='msg-tooltip'>Commit 6680880f9b8dceb4f2f3f91bd2b13c659b53835e pushes out a new guix
package with a new key location, so we need to update to the new key
in order for systems to build correctly.

* gnu/services/base.scm (%default-authorized-guix-keys): Refer to berlin.guix.gnu.org.pub.
</span></span></td><td>Christopher Lemmer Webber</td></tr>
<tr><td><span title='2020-07-10 11:48:05 +0200'>2020-07-10</span></td><td><a href='/guix/commit/gnu/services/base.scm?id=ec4c404c0575b340a04b3922fb828ac5417832dd'>services: guix: Refer to 'berlin.guixsd.org.pub'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This partly reverts d283bb960f927dd5f7bb8b96bc697221e4e8ad39.

* gnu/services/base.scm (%default-authorized-guix-keys): Refer to berlin.guixsd.org.pub.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-07-10 00:11:00 +0200'>2020-07-10</span></td><td><a href='/guix/commit/gnu/services/base.scm?id=d283bb960f927dd5f7bb8b96bc697221e4e8ad39'>maint: Remove traces of "berlin.guixsd.org".</a><span class='msg-avail'>...<span class='msg-tooltip'>The guixsd.org domain is no longer advertised since before in 1.0.0
release in May 2019.

* etc/substitutes/berlin.guixsd.org.pub: Rename to...
* etc/substitutes/berlin.guix.gnu.org.pub: ... this.
* etc/substitutes/ci.guix.gnu.org.pub,
etc/substitutes/ci.guix.info.pub: Adjust accordingly.
* gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
* guix/build/download-nar.scm (urls-for-item): Likewise.
* guix/self.scm (miscellaneous-files): Likewise.
* Makefile.am (dist_pkgdata_DATA): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>