[arch-commits] Commit in llpp/trunk (Makefile PKGBUILD)

[Eli Schwartz]

    Date: Thursday, May 3, 2018 @ 22:15:14
  Author: eschwartz
Revision: 318898

Compulsively modify all variables from the old style ${VAR} to the new style $(VAR)

Modified:
  llpp/trunk/Makefile
  llpp/trunk/PKGBUILD

----------+
 Makefile |   50 +++++++++++++++++++++++++-------------------------
 PKGBUILD |    3 ++-
 2 files changed, 27 insertions(+), 26 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2018-05-03 21:35:35 UTC (rev 318897)
+++ Makefile	2018-05-03 22:15:14 UTC (rev 318898)
@@ -1,5 +1,5 @@
 VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
-ifeq "${VERSION}" ""
+ifeq "$(VERSION)" ""
 VERSION = 26b
 endif
 
@@ -12,8 +12,8 @@
        -lz -lopenjp2 -ljpeg -lfreetype -lharfbuzz
 
 CPPFLAGS += -D_GNU_SOURCE -DFFP
-CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS}
+CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(INCS) $(CPPFLAGS)
+LDFLAGS += -g $(LIBS)
 
 # ocaml
 CAMLOPT = ocamlopt
@@ -22,22 +22,22 @@
 VPATH = wsi/x11
 
 SRC = utils.ml keys.ml wsi.ml parser.ml config.ml main.ml
-OBJ = help.cmx ${SRC:.ml=.cmx}
+OBJ = help.cmx $(SRC:.ml=.cmx)
 MOD = unix.cmxa str.cmxa lablgl.cmxa
 SRCMANS = $(wildcard man/*.man)
-MANS = ${SRCMANS:.man=.1}
+MANS = $(SRCMANS:.man=.1)
 
-DISTFILES := Makefile ${SRC} link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES := Makefile $(SRC) link.c glfont.c keysym2ucs.c wsi.mli
 DISTFILES += mkhelp.sh KEYS README BUILDING
 DISTFILES += misc/ man/
 
-all: llpp ${MANS}
+all: llpp $(MANS)
 
-llpp: ${OBJ} link.o
-	${CAMLOPT} -o $@ ${CAMLFLAGS} link.o -cclib '${LDFLAGS}' ${MOD} ${OBJ}
+llpp: $(OBJ) link.o
+	$(CAMLOPT) -o $@ $(CAMLFLAGS) link.o -cclib '$(LDFLAGS)' $(MOD) $(OBJ)
 
 main.cmx: main.ml utils.cmx config.cmx
-	${CAMLOPT} -c -o $@ ${CAMLFLAGS} -thread $^
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) -thread $^
 
 wsi.cmx: wsi.cmi utils.cmx keys.cmx
 
@@ -44,7 +44,7 @@
 wsi.cmi: utils.cmx
 
 help.ml: mkhelp.sh KEYS
-	sh mkhelp.sh KEYS ${VERSION} > $@
+	sh mkhelp.sh KEYS $(VERSION) > $@
 
 config.cmx: wsi.cmi parser.cmx utils.cmx help.cmx
 
@@ -55,13 +55,13 @@
 .SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly
 
 .c.o:
-	${CAMLOPT} -c -o $@ ${CAMLFLAGS} -cc ${CC} -ccopt '${CFLAGS}' $<
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS)' $<
 
 .ml.cmx:
-	${CAMLOPT} -c -o $@ ${CAMLFLAGS} $<
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
 
 .mli.cmi:
-	${CAMLOPT} -c -o $@ ${CAMLFLAGS} $<
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
 
 %.1: %.man man/asciidoc.conf
 	a2x -d manpage -f manpage --asciidoc-opts="-f man/asciidoc.conf --out-file=$@.xml" $<
@@ -69,18 +69,18 @@
 .PHONY: all clean dist install
 
 clean:
-	${RM} llpp link.o help.ml ${OBJ} ${OBJ:.cmx=.cmi} ${OBJ:.cmx=.o} ${MANS} ${MANS:.1=.xml}
+	$(RM) llpp link.o help.ml $(OBJ) $(OBJ:.cmx=.cmi) $(OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
 
 dist: clean
-	mkdir llpp-${VERSION}
-	cp -r ${DISTFILES} llpp-${VERSION}
-	tar czf llpp-${VERSION}.tar.gz llpp-${VERSION}
-	rm -rf llpp-${VERSION}
+	mkdir llpp-$(VERSION)
+	cp -r $(DISTFILES) llpp-$(VERSION)
+	tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
+	rm -rf llpp-$(VERSION)
 
 install:
-	install -Dm755 llpp ${DESTDIR}${PREFIX}/bin/llpp
-	install -Dm644 -t ${DESTDIR}${PREFIX}/share/man/man1  man/*.1
-	install -Dm755 misc/llppac ${DESTDIR}${PREFIX}/bin/llppac
-	install -Dm755 misc/llpphtml ${DESTDIR}${PREFIX}/bin/llpphtml
-	install -Dm644 misc/llpp.desktop ${DESTDIR}${PREFIX}/share/applications/llpp.desktop
-	install -Dm644 README ${DESTDIR}${PREFIX}/share/licenses/llpp/README
+	install -Dm755 llpp $(DESTDIR)$(PREFIX)/bin/llpp
+	install -Dm644 -t $(DESTDIR)$(PREFIX)/share/man/man1  man/*.1
+	install -Dm755 misc/llppac $(DESTDIR)$(PREFIX)/bin/llppac
+	install -Dm755 misc/llpphtml $(DESTDIR)$(PREFIX)/bin/llpphtml
+	install -Dm644 misc/llpp.desktop $(DESTDIR)$(PREFIX)/share/applications/llpp.desktop
+	install -Dm644 README $(DESTDIR)$(PREFIX)/share/licenses/llpp/README

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-03 21:35:35 UTC (rev 318897)
+++ PKGBUILD	2018-05-03 22:15:14 UTC (rev 318898)
@@ -4,6 +4,7 @@
 
 pkgname=llpp
 pkgver=27
+# Often breaks with mupdf, which means I'll occasionally need to pin a specific commit.
 _commit=87faa123127cc0746c28531874af7aaef1feb574
 pkgrel=1
 pkgdesc='opengl accelerated pdf viewer based on mupdf'
@@ -36,7 +37,7 @@
         'Makefile')
 sha256sums=('SKIP'
             '29a9550c6502c9de7db14f2f61edc6b77c7ebee9f1de8b865d4e1b219b9ae377'
-            '5cc71dfe8fb7f5d79c445f3c65ae92b48ff2d22e4bdb48408504a13b1ebd09b2')
+            '5df7ac01f1de94d42f591a3146209c0263d610c852cfa95d7b3a8d8a7bcc5c7e')
 
 pkgver() {
     cd "${srcdir}"/${pkgname}