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 $@ $<
 
on 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=1228b3134f102438b65f49ac0edcb128df8129a7'>root</a>/<a href='/guix/log/gnu?id=1228b3134f102438b65f49ac0edcb128df8129a7'>gnu</a>/<a href='/guix/log/gnu/build?id=1228b3134f102438b65f49ac0edcb128df8129a7'>build</a>/<a href='/guix/log/gnu/build/jami-service.scm?id=1228b3134f102438b65f49ac0edcb128df8129a7'>jami-service.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/build/jami-service.scm?id=1228b3134f102438b65f49ac0edcb128df8129a7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-09-23 23:56:15 -0400'>2022-09-23</span></td><td><a href='/guix/commit/gnu/build/jami-service.scm?id=21afbf54cd1e6666f5ec400ea365d971de466fab'>build: jami-service: account-&gt;username always return a fingerprint.</a><span class='msg-avail'>...<span class='msg-tooltip'>This change is motivated by the fact that Account.registeredName is a volatile
account data, not exported along the account and retrieved from the name
server.  Have it always return Account.username instead, so that the result is
reproducible independent of whether networking is available or not.

* gnu/build/jami-service.scm (account-&gt;username): Always return the account
fingerprint.  Adjust doc.
(id-&gt;username): Likewise.
</span></span></td><td>Maxim Cournoyer</td></tr>