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 $@ $<
 
/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=d085fcf49372a369affad0745d4c891fc6e665ea'>root</a>/<a href='/guix/log/po?id=d085fcf49372a369affad0745d4c891fc6e665ea'>po</a>/<a href='/guix/log/po/packages?id=d085fcf49372a369affad0745d4c891fc6e665ea'>packages</a>/<a href='/guix/log/po/packages/fr.po?id=d085fcf49372a369affad0745d4c891fc6e665ea'>fr.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/packages/fr.po?id=d085fcf49372a369affad0745d4c891fc6e665ea&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-04-01 14:09:20 +0200'>2024-04-01</span></td><td><a href='/guix/commit/po/packages/fr.po?id=fa98837b1d9586b9ca7bf77dae22c3bde0fc59b5'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/guix/ar.po: New file.
* po/guix/LINGUAS: Add 'ar'.
* po/doc/guix-cookbook.pt_BR.po: New file.
* po/doc/local.mk: Add 'pt_BR' cookbook.
* doc/local.mk: Add 'pt_BR' cookbook.
* doc/htmlxref.cnf: Update URLs for cookbook.
* doc/build.scm (%cookbook-languages): Add 'ko', 'pt_BR'.
* doc/guix-cookbook.texi (Top): Mention 'ko', 'pt_BR' cookbook.

Change-Id: Id1846ca100263b3fc1fa2ed52654c670270ee809
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2024-02-01 18:34:22 +0100'>2024-02-01</span></td><td><a href='/guix/commit/po/packages/fr.po?id=6f78803b01d416ab421ba860751b764b9e4f33db'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>Change-Id: I42b5d41bdd5cd1b096c977e132b7a85992223402
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-05-31 17:23:21 +0200'>2023-05-31</span></td><td><a href='/guix/commit/po/packages/fr.po?id=8e9e6a6482f3ba98d1cdcad344ee488e8751fee7'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix-cookbook.texi (Top): Mention Slovak.
</span></span></td><td>Florian Pelz</td></tr>
<tr><td><span title='2023-03-07 21:14:57 +0100'>2023-03-07</span></td><td><a href='/guix/commit/po/packages/fr.po?id=d333958763b0840c4cd895601b079b68358a6a46'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-12-04 22:25:23 +0100'>2022-12-04</span></td><td><a href='/guix/commit/po/packages/fr.po?id=2e75b328b6bbdadbffe5b643a4891b5026a0defd'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>po/packages/vi.po: New file.
po/packages/LINGUAS: Add it.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-11-04 10:56:38 +0100'>2022-11-04</span></td><td><a href='/guix/commit/po/packages/fr.po?id=a65ce9dd500460af4f97e7398fb35dd817f4c677'>nls: Update translations.</a><span class='msg-avail'>...<span class='msg-tooltip'>* po/guix/lt.po: New file.
* po/guix/LINGUAS: Add lt.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2022-10-06 08:20:20 +0200'>2022-10-06</span></td><td><a href='/guix/commit/po/packages/fr.po?id=70fc8f6d619ce9f16a8cc0bbb10a011bd3a9997a'>nls: Update translations.</a></td><td>Julien Lepiller</td></tr>