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 $@ $<
 
e6832f87'/><select name='qt'>
<option value='grep'>log msg</option>
<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=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87'>root</a>/<a href='/guix/log/gnu?id=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87'>gnu</a>/<a href='/guix/log/gnu/services?id=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87'>services</a>/<a href='/guix/log/gnu/services/security-token.scm?id=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87'>security-token.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/security-token.scm?id=b77b4c7c3a5ac180f5aed0983be50ffbe6832f87&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-07-03 20:13:42 +0200'>2021-07-03</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=e789ce538ed848bacb8f4eb5742f78b965ccf57c'>services: pcscd: Fix daemon signal handling.</a><span class='msg-avail'>...<span class='msg-tooltip'>"pcscd" wouldn't handle SIGTERM as it inherit ignoring this signal (and
others) from its parent shepherd; fork+exec-command restore signal
handling.  Fixes &lt;https://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd)[start]: Use
fork+exec-command to start "pcscd".
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2021-06-19 23:49:18 +0200'>2021-06-19</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=4bed8486d4c0a4ff142903b8bc1584ce84767355'>services: pcscd: Cleanup socket when started.</a><span class='msg-avail'>...<span class='msg-tooltip'>Otherwise when pcscd doesn't terminate properly (ie. receive a SIGKILL),
it won't start again because of it's socket already existing.

* gnu/services/security-token.scm (pcscd-shepherd-service)[start]:
Remove existing socket file.
</span></span></td><td>Brice Waegeneire</td></tr>
<tr><td><span title='2020-12-13 00:35:49 +0100'>2020-12-13</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=a4cd86ff4b7a9dd4bf1a5320b8121b470e381b67'>gnu: htop: Update to 3.0.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/admin.scm (htop): Update to 3.0.3.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-12-12 23:10:05 +0100'>2020-12-12</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=8f2656f1debffe92ea088f4c88cfe8ec560b2ba3'>services: pcscd-shepherd-service: Fix PID file location.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://issues.guix.gnu.org/45202&gt;.

* gnu/services/security-token.scm (pcscd-shepherd-service): Look for
pcscd.pid in /run instead of /var/run.

Reported by Raffael Stocker &lt;r.stocker@mnet-mail.de&gt;.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>