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 $@ $<
 
me='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=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9&amp;ofs=50'>root</a>/<a href='/guix/log/gnu?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9&amp;ofs=50'>gnu</a>/<a href='/guix/log/gnu/packages?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9&amp;ofs=50'>packages</a>/<a href='/guix/log/gnu/packages/containers.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9&amp;ofs=50'>containers.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/containers.scm?id=cea2e7633ddbce9ce467d752d1db61f7d6c63aa9&amp;ofs=50&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-03-02 17:18:17 +0100'>2024-03-02</span></td><td><a href='/guix/commit/gnu/packages/containers.scm?id=61694dc1cd8888adab34841171fc098d9d206dfe'>gnu: Add passt.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/containers.scm (passt): New variable.

Change-Id: I2ebdd9d4255a89a86fb196568215b74bb61cb3a6
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Tomas Volf</td></tr>
<tr><td><span title='2024-02-14 15:27:12 +0000'>2024-02-14</span></td><td><a href='/guix/commit/gnu/packages/containers.scm?id=b24c1bab470f991fa29bdd7d2bda12b30d4eb126'>gnu: crun: Adjust package ideation.</a><span class='msg-avail'>...<span class='msg-tooltip'>The release package provides the configured version, so there is no need
to use git commit to adjust version detection.

* gnu/packages/containers.scm (crun): Remove let and indent the package.
[arguments] &lt;#:phases&gt;: Remove 'do-no-depend-on-git phase as the package
includes release version.

Change-Id: Ie50fe1f5f8ed69a77e353033679bfd98db6e56f4
</span></span></td><td>Sharlatan Hellseher</td></tr>
<tr><td><span title='2024-02-14 15:27:12 +0000'>2024-02-14</span></td><td><a href='/guix/commit/gnu/packages/containers.scm?id=6002e9e7711136373de5a6325769e9c7d11032c9'>gnu: crun: Update to 1.14.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>Since upstream does provide properly packaged source archives, the fetch
method was switched from git to url.

* gnu/packages/containers.scm (crun): Update to 1.14.1.

Change-Id: I566d8742b1a3db75aefaa51032e09130a8307a61
Signed-off-by: Sharlatan Hellseher &lt;sharlatanus@gmail.com&gt;
</span></span></td><td>Tomas Volf</td></tr>
<tr><td><span title='2024-02-14 13:19:02 +0000'>2024-02-14</span></td><td><a href='/guix/commit/gnu/packages/containers.scm?id=b9868463f63bcaeb42cd1dcc869b3cfca440c8cf'>gnu: slirp4netns: Update to 1.2.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/containers.scm (slirp4netns): Update to 1.2.3.

Change-Id: I103b697069e631653e9063ee42456d0d0e898900
Signed-off-by: Christopher Baines &lt;mail@cbaines.net&gt;
</span></span></td><td>Tomas Volf</td></tr>
<tr><td><span title='2023-10-13 17:45:56 +0200'>2023-10-13</span></td><td><a href='/guix/commit/gnu/packages/containers.scm?id=dcfd4d9c4827ca6bfebeec46fe6bb8373c425a1c'>gnu: distrobox: Update to 1.5.0.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/containers.scm (distrobox): Update to 1.5.0.2.
[arguments]: Do not patch files with extensions, such as a .pdf.
</span></span></td><td>Ricardo Wurmus</td></tr>