From 7dcce9e1b9dbd2be198c19abd36e71eba7d09063 Mon Sep 17 00:00:00 2001
From: Quentin Rameau
Date: Sat, 7 Nov 2020 18:43:11 +0100
Subject: Makefile: use explicit targets

Some make implementation have trouble with following inference rules
indirection
---
 Makefile | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9f93b0b..e5d4172 100644
--- a/Makefile
+++ b/Makefile
@@ -19,22 +19,22 @@ options:
 	@echo "WEBEXTCFLAGS  = $(WEBEXTCFLAGS) $(CFLAGS)"
 	@echo "LDFLAGS       = $(LDFLAGS)"
 
-.c.o:
-	$(CC) $(SURFCFLAGS) $(CFLAGS) -c $<
+surf: $(OBJ)
+	$(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 
-.o.so:
-	$(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS)
+$(OBJ) $(WOBJ): config.h common.h config.mk
 
 config.h:
 	cp config.def.h $@
 
-$(OBJ) $(WOBJ): config.h common.h config.mk
+$(OBJ): $(SRC)
+	$(CC) $(SURFCFLAGS) $(CFLAGS) -c $(SRC)
 
-surf: $(OBJ)
-	$(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+$(WLIB): $(WOBJ)
+	$(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $? $(WEBEXTLIBS)
 
-$(WOBJ):
-	$(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(@:.o=.c)
+$(WOBJ): $(WSRC)
+	$(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(WSRC)
 
 clean:
 	rm -f surf $(OBJ)
@@ -73,5 +73,4 @@ uninstall:
 	done
 	- rmdir $(DESTDIR)$(LIBDIR)
 
-.SUFFIXES: .so .o .c
 .PHONY: all options distclean clean dist install uninstall
-- 
cgit v1.2.3-59-g8ed1b

f='/surf/commit/config.def.h?id=eb32dd6eca5b6224bb5fb28cadef5bd035581ef3&amp;follow=1'>commit</a><a href='/surf/diff/config.def.h?id=eb32dd6eca5b6224bb5fb28cadef5bd035581ef3&amp;follow=1'>diff</a><a href='/surf/stats/config.def.h'>stats</a></td><td class='form'><form class='right' method='get' action='/surf/log/config.def.h'>
<input type='hidden' name='id' value='eb32dd6eca5b6224bb5fb28cadef5bd035581ef3'/><input type='hidden' name='showmsg' value='1'/><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='/surf/log/?id=eb32dd6eca5b6224bb5fb28cadef5bd035581ef3&amp;ofs=150&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/surf/log/config.def.h?id=eb32dd6eca5b6224bb5fb28cadef5bd035581ef3&amp;ofs=150&amp;showmsg=1&amp;follow=1'>config.def.h</a> (<a href='/surf/log/config.def.h?id=eb32dd6eca5b6224bb5fb28cadef5bd035581ef3&amp;ofs=150&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/surf/log/config.def.h?id=eb32dd6eca5b6224bb5fb28cadef5bd035581ef3&amp;ofs=150&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th><th class='left'>Files</th><th class='left'>Lines</th></tr>
<tr class='logheader'><td><span title='2015-01-18 11:44:39 +0100'>2015-01-18</span></td><td class='logsubject'><a href='/surf/commit/surf.c?id=9333d5d72740b97d66df9bc4e3777d24c884c033&amp;follow=1'>My CMD was too short. :O</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Thanks Carlos Torres for mentioning this.


</td></tr>
<tr class='logheader'><td><span title='2015-01-17 20:52:16 +0100'>2015-01-17</span></td><td class='logsubject'><a href='/surf/commit/surf.1?id=e7d1c09916f2edc8a6b9638f1695a740cf803fc4&amp;follow=1'>Add the manpage changes for the disk cache support.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+7</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2015-01-17 20:50:21 +0100'>2015-01-17</span></td><td class='logsubject'><a href='/surf/commit/surf.c?id=117d4848338315d15e1ab93cd551889fc6964a2b&amp;follow=1'>Adding disk cache support for soup.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>2</td><td><span class='deletions'>-9</span>/<span class='insertions'>+40</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
This is a merge of the patch of Ben Woolley &lt;tautolog@gmail.com&gt;


</td></tr>
<tr class='logheader'><td><span title='2015-01-17 07:23:48 +0100'>2015-01-17</span></td><td class='logsubject'><a href='/surf/commit/surf.c?id=24ec46fc241b655bf91a4529fa164ae9703d4eb6&amp;follow=1'>Fix extra newline, and add -g where other switches are forwarded.</a></td><td><img src='//www.gravatar.com/avatar/d2e9d63f7cf26b77a8539ea5adfd03b3?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Ben Woolley
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+3</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Signed-off-by: Christoph Lohmann &lt;20h@r-36.net&gt;


</td></tr>
<tr class='logheader'><td><span title='2015-01-17 07:21:15 +0100'>2015-01-17</span></td><td class='logsubject'><a href='/surf/commit/config.mk?id=a5b85836ac04a82f965a9d7fb2a011d614166610&amp;follow=1'>Newer libc want _DEFAULT_SOURCE.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2015-01-17 07:19:48 +0100'>2015-01-17</span></td><td class='logsubject'><a href='/surf/commit/surf.c?id=c2da2bae5dbca73f26fe77bb8080e2a90d3cbb1d&amp;follow=1'>Major styles update.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>3</td><td><span class='deletions'>-11</span>/<span class='insertions'>+84</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
In config.h there is now some styles array to apply site-specific styles.
This can be toggled using the -mM flags. If a stylefile is manually specified,
then this will overwrite everything.


</td></tr>
<tr class='logheader'><td><span title='2015-01-02 14:18:23 +0100'>2015-01-02</span></td><td class='logsubject'><a href='/surf/commit/surf.1?id=c467e5a3b3f3e1d69b64d31a166aa9d69336ef53&amp;follow=1'>Fix a typo in surf manual.</a></td><td><img src='//www.gravatar.com/avatar/255b0472c4482c3ea433ab84b4e742e8?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Jakukyo Friel
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
`Ctrl-/` displays incorrectly in `man surf` on my machine.

A patch is attached.

(You also access it here:
https://github.com/weakish/surf/commit/07e97eccedd96eabf14b2fbf77de75ec1b594d97)

----

 surf.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Signed-off-by: Christoph Lohmann &lt;20h@r-36.net&gt;


</td></tr>
<tr class='logheader'><td><span title='2014-09-28 08:03:42 +0200'>2014-09-28</span></td><td class='logsubject'><a href='/surf/commit/surf.c?id=3e89b4451cfac593e233e449b9a403720598b08f&amp;follow=1'>Minor style change.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+1</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2014-09-28 08:02:48 +0200'>2014-09-28</span></td><td class='logsubject'><a href='/surf/commit/surf.c?id=dd705d43eb13493b682e214748d1810fc6254452&amp;follow=1'>Make »Copy image address« work.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-3</span>/<span class='insertions'>+10</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Thanks yui@blekksprut.net for the patch!


</td></tr>
<tr class='logheader'><td><span title='2014-08-07 17:35:27 +0200'>2014-08-07</span></td><td class='logsubject'><a href='/surf/commit/surf.1?id=531f71f85199be4e459cef5c551b408e2dd103dd&amp;follow=1'>Mention xdotool in SEE ALSO too.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+2</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2014-08-07 17:34:43 +0200'>2014-08-07</span></td><td class='logsubject'><a href='/surf/commit/surf.1?id=d5b04aac6068c3b2ff4e4f14919e68a92724868a&amp;follow=1'>Fix the manpage about xid.</a></td><td><img src='//www.gravatar.com/avatar/5466a16584c48c395293d4e5d2eb0af0?s=13&amp;d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann
</td><td>1</td><td><span class='deletions'>-1</span>/<span class='insertions'>+3</span></td></tr>
<tr class='nohover-highlight'><td/><td colspan='5' class='logmsg'>
Something was missing from this one sentence. Now it is complete.


</td></tr>