remove patches or patch fragments for make -C

This commit is contained in:
naddy 2015-03-14 21:30:54 +00:00
parent ce878faaba
commit 50ee09dadb
2 changed files with 1 additions and 35 deletions

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-pbmtools_Makefile,v 1.4 2014/04/08 13:59:32 sthen Exp $
$OpenBSD: patch-pbmtools_Makefile,v 1.5 2015/03/14 21:30:54 naddy Exp $
--- pbmtools/Makefile.orig Thu Mar 27 18:47:15 2014
+++ pbmtools/Makefile Tue Apr 8 14:54:55 2014
@@ -10,7 +10,7 @@ CPPFLAGS = -I../libjbig
@ -10,20 +10,6 @@ $OpenBSD: patch-pbmtools_Makefile,v 1.4 2014/04/08 13:59:32 sthen Exp $
txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
@@ -33,11 +33,11 @@ pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h
../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
- make -C ../libjbig libjbig.a
+ cd ../libjbig; $(MAKE) libjbig.a
../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
- make -C ../libjbig libjbig85.a
+ cd ../libjbig; $(MAKE) libjbig85.a
analyze:
clang $(CPPFLAGS) --analyze *.c
@@ -111,8 +111,11 @@ test85: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 test-t
make IMG=t82 "OPTIONSP=-Y -1 1920" dotest85
make IMG=t82 "OPTIONSP=-Y -1 1949" dotest85
@ -36,12 +22,3 @@ $OpenBSD: patch-pbmtools_Makefile,v 1.4 2014/04/08 13:59:32 sthen Exp $
make IMG=ccitt3 dotest85
rm -f test-*.jbg test-*.jbg85 test-*.pbm
@echo
@@ -147,7 +150,7 @@ test-%.pbm: ../examples/%.jbg
./jbgtopbm $< $@
test-t82.pbm:
- make -C ../libjbig tstcodec
+ cd ../libjbig; $(MAKE) tstcodec
../libjbig/tstcodec $@
FOPT=-c 1000 -p 300000 -m 3

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-rebar_config,v 1.1.1.1 2013/03/08 12:06:44 jasper Exp $
--- rebar.config.orig Mon Mar 4 14:15:19 2013
+++ rebar.config Mon Mar 4 14:17:15 2013
@@ -12,5 +12,5 @@
{port_specs, [{"priv/bcrypt_nif.so", ["c_src/*.c"]}]}.
{post_hooks,
- [{clean, "make -C c_src clean"},
- {compile, "make -C c_src"}]}.
+ [{clean, "cd c_src && make clean"},
+ {compile, "cd c_src && make"}]}.