diff options
| author | Ivan Shapovalov | 2017-03-24 21:23:32 +0300 |
|---|---|---|
| committer | Ivan Shapovalov | 2017-03-24 21:23:32 +0300 |
| commit | d34268b7458941336ade673483f1b58f70b1494f (patch) | |
| tree | 4f8afd60f00a27747d55273b4eba125720374bf1 /0005-Makefile-leverage-default-rules-as-much-as-possible-.patch | |
| parent | b61d7ed35602b1f242cd45c91c09809a553596c7 (diff) | |
| download | aur-d34268b7458941336ade673483f1b58f70b1494f.tar.gz | |
Bump to 20170320; rebase patches.
Diffstat (limited to '0005-Makefile-leverage-default-rules-as-much-as-possible-.patch')
| -rw-r--r-- | 0005-Makefile-leverage-default-rules-as-much-as-possible-.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch index 4179986f7c31..5fac215c1bdc 100644 --- a/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch +++ b/0005-Makefile-leverage-default-rules-as-much-as-possible-.patch @@ -1,19 +1,19 @@ -From 4faa0bbf6677fb50de69bde04771ab90be6be081 Mon Sep 17 00:00:00 2001 +From 8bb1fc15f4151cbe19f566f98b5d17efb60d3810 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov <intelfx@intelfx.name> Date: Sun, 23 Oct 2016 01:01:59 +0300 Subject: [PATCH 5/5] Makefile: leverage default rules as much as possible to fix behavior wrt user compile flags --- - Makefile | 92 +++++++++++++++------------------------------------------ + Makefile | 96 +++++++++++++++------------------------------------------ icc2ps/Makefile | 13 ++++---- - 2 files changed, 30 insertions(+), 75 deletions(-) + 2 files changed, 31 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile -index fcca27e..615f9e1 100644 +index da5dac7..aab4db6 100644 --- a/Makefile +++ b/Makefile -@@ -452,33 +452,15 @@ all-done: +@@ -456,33 +456,15 @@ all-done: @echo "yourself." @@ -56,7 +56,7 @@ index fcca27e..615f9e1 100644 foo2zjs-loadfw: foo2zjs-loadfw.in Makefile [ ! -f $@ ] || chmod +w $@ -@@ -562,54 +544,26 @@ getweb: getweb.in Makefile +@@ -566,57 +548,27 @@ getweb: getweb.in Makefile chmod 555 $@ all-icc2ps: @@ -71,6 +71,9 @@ index fcca27e..615f9e1 100644 -ok: ok.o $(LIBJBG) - $(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@ - +-ddstdecode: ddstdecode.o $(LIBJBG) +- $(CC) $(CFLAGS) ddstdecode.o $(LIBJBG) -o $@ +- -gipddecode: gipddecode.o $(LIBJBG) - $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ - @@ -110,6 +113,7 @@ index fcca27e..615f9e1 100644 -command2foo2lava-pjl.o: command2foo2lava-pjl.c - $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c +ok: $(LIBJBG) ++ddstdecode: $(LIBJBG) +gipddecode: $(LIBJBG) +hbpldecode: $(LIBJBG) +hipercdecode: $(LIBJBG) @@ -126,7 +130,7 @@ index fcca27e..615f9e1 100644 # # Installation rules diff --git a/icc2ps/Makefile b/icc2ps/Makefile -index fab1d01..f71c341 100644 +index f3abb99..5be5749 100644 --- a/icc2ps/Makefile +++ b/icc2ps/Makefile @@ -9,19 +9,20 @@ SRC= icc2ps.c xgetopt.c @@ -157,5 +161,5 @@ index fab1d01..f71c341 100644 install: all $(INSTALL) -c foo2zjs-icc2ps $(BIN) -- -2.10.2 +2.12.1 |