| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
VERSION=1.0 |
| 2 | 2 |
|
| 3 | 3 |
CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
| 4 |
-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps -Werror=vla |
|
| 4 |
+CFLAGS+=-MD -Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps -Werror=vla |
|
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
MANDIR?=$(PREFIX)/share/man |
| 7 | 7 |
BINDIR?=$(PREFIX)/bin |
| ... | ... |
@@ -49,9 +49,11 @@ fmt: |
| 49 | 49 |
clang-format -i src/*.c src/*.h |
| 50 | 50 |
|
| 51 | 51 |
clean: |
| 52 |
- rm -f fzy test/fzytest src/*.o deps/*/*.o |
|
| 52 |
+ rm -f fzy test/fzytest src/*.o src/*.d deps/*/*.o |
|
| 53 | 53 |
|
| 54 | 54 |
veryclean: clean |
| 55 | 55 |
rm -f config.h |
| 56 | 56 |
|
| 57 | 57 |
.PHONY: test check all clean veryclean install fmt acceptance |
| 58 |
+ |
|
| 59 |
+-include $(OBJECTS:.o=.d) |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
VERSION=1.0 |
| 2 | 2 |
|
| 3 | 3 |
CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
| 4 |
-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps |
|
| 4 |
+CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic -Ideps -Werror=vla |
|
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
MANDIR?=$(PREFIX)/share/man |
| 7 | 7 |
BINDIR?=$(PREFIX)/bin |
| ... | ... |
@@ -22,7 +22,7 @@ test/fzytest: $(TESTOBJECTS) |
| 22 | 22 |
$(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) $(LIBS) |
| 23 | 23 |
|
| 24 | 24 |
acceptance: fzy |
| 25 |
- cd test/acceptance && bundle && bundle exec ruby acceptance_test.rb |
|
| 25 |
+ cd test/acceptance && bundle --quiet && bundle exec ruby acceptance_test.rb |
|
| 26 | 26 |
|
| 27 | 27 |
test: check |
| 28 | 28 |
check: test/fzytest |
| ... | ... |
@@ -14,7 +14,7 @@ INSTALL_DATA=${INSTALL} -m 644
|
| 14 | 14 |
LIBS=-lpthread |
| 15 | 15 |
OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o src/tty_interface.o |
| 16 | 16 |
THEFTDEPS = deps/theft/theft.o deps/theft/theft_bloom.o deps/theft/theft_mt.o deps/theft/theft_hash.o |
| 17 |
-TESTOBJECTS=test/fzytest.c test/test_properties.c src/match.o src/choices.o src/options.o $(THEFTDEPS) |
|
| 17 |
+TESTOBJECTS=test/fzytest.c test/test_properties.c test/test_choices.c test/test_match.c src/match.o src/choices.o src/options.o $(THEFTDEPS) |
|
| 18 | 18 |
|
| 19 | 19 |
all: fzy |
| 20 | 20 |
|
| ... | ... |
@@ -13,7 +13,8 @@ INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 | 14 |
LIBS=-lpthread |
| 15 | 15 |
OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o src/tty_interface.o |
| 16 |
-TESTOBJECTS=test/fzytest.c src/match.o src/choices.o src/options.o |
|
| 16 |
+THEFTDEPS = deps/theft/theft.o deps/theft/theft_bloom.o deps/theft/theft_mt.o deps/theft/theft_hash.o |
|
| 17 |
+TESTOBJECTS=test/fzytest.c test/test_properties.c src/match.o src/choices.o src/options.o $(THEFTDEPS) |
|
| 17 | 18 |
|
| 18 | 19 |
all: fzy |
| 19 | 20 |
|
| ... | ... |
@@ -13,7 +13,7 @@ INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 | 14 |
LIBS=-lpthread |
| 15 | 15 |
OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o src/tty_interface.o |
| 16 |
-TESTOBJECTS=test/fzytest.c src/match.o src/choices.o |
|
| 16 |
+TESTOBJECTS=test/fzytest.c src/match.o src/choices.o src/options.o |
|
| 17 | 17 |
|
| 18 | 18 |
all: fzy |
| 19 | 19 |
|
| ... | ... |
@@ -20,8 +20,8 @@ all: fzy |
| 20 | 20 |
test/fzytest: $(TESTOBJECTS) |
| 21 | 21 |
$(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) $(LIBS) |
| 22 | 22 |
|
| 23 |
-integration_test: fzy |
|
| 24 |
- cd test/integration && bundle && bundle exec ruby integration_test.rb |
|
| 23 |
+acceptance: fzy |
|
| 24 |
+ cd test/acceptance && bundle && bundle exec ruby acceptance_test.rb |
|
| 25 | 25 |
|
| 26 | 26 |
test: check |
| 27 | 27 |
check: test/fzytest |
| ... | ... |
@@ -53,4 +53,4 @@ clean: |
| 53 | 53 |
veryclean: clean |
| 54 | 54 |
rm -f config.h |
| 55 | 55 |
|
| 56 |
-.PHONY: test check all clean veryclean install fmt integration_test |
|
| 56 |
+.PHONY: test check all clean veryclean install fmt acceptance |
| ... | ... |
@@ -20,6 +20,9 @@ all: fzy |
| 20 | 20 |
test/fzytest: $(TESTOBJECTS) |
| 21 | 21 |
$(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) $(LIBS) |
| 22 | 22 |
|
| 23 |
+integration_test: fzy |
|
| 24 |
+ cd test/integration && bundle && bundle exec ruby integration_test.rb |
|
| 25 |
+ |
|
| 23 | 26 |
test: check |
| 24 | 27 |
check: test/fzytest |
| 25 | 28 |
$(DEBUGGER) ./test/fzytest |
| ... | ... |
@@ -50,4 +53,4 @@ clean: |
| 50 | 53 |
veryclean: clean |
| 51 | 54 |
rm -f config.h |
| 52 | 55 |
|
| 53 |
-.PHONY: test check all clean veryclean install fmt |
|
| 56 |
+.PHONY: test check all clean veryclean install fmt integration_test |
| ... | ... |
@@ -11,20 +11,21 @@ INSTALL=install |
| 11 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| 12 | 12 |
INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 |
+LIBS=-lpthread |
|
| 14 | 15 |
OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o src/tty_interface.o |
| 15 | 16 |
TESTOBJECTS=test/fzytest.c src/match.o src/choices.o |
| 16 | 17 |
|
| 17 | 18 |
all: fzy |
| 18 | 19 |
|
| 19 | 20 |
test/fzytest: $(TESTOBJECTS) |
| 20 |
- $(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) |
|
| 21 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) $(LIBS) |
|
| 21 | 22 |
|
| 22 | 23 |
test: check |
| 23 | 24 |
check: test/fzytest |
| 24 | 25 |
$(DEBUGGER) ./test/fzytest |
| 25 | 26 |
|
| 26 | 27 |
fzy: $(OBJECTS) |
| 27 |
- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) |
|
| 28 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) $(LIBS) |
|
| 28 | 29 |
|
| 29 | 30 |
%.o: %.c config.h |
| 30 | 31 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| ... | ... |
@@ -11,7 +11,7 @@ INSTALL=install |
| 11 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| 12 | 12 |
INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 |
-OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o |
|
| 14 |
+OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o src/tty_interface.o |
|
| 15 | 15 |
TESTOBJECTS=test/fzytest.c src/match.o src/choices.o |
| 16 | 16 |
|
| 17 | 17 |
all: fzy |
| ... | ... |
@@ -11,7 +11,7 @@ INSTALL=install |
| 11 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| 12 | 12 |
INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 |
-OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o |
|
| 14 |
+OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o src/options.o |
|
| 15 | 15 |
TESTOBJECTS=test/fzytest.c src/match.o src/choices.o |
| 16 | 16 |
|
| 17 | 17 |
all: fzy |
| ... | ... |
@@ -12,16 +12,16 @@ INSTALL_PROGRAM=$(INSTALL) |
| 12 | 12 |
INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 | 14 |
OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o |
| 15 |
-TESTOBJECTS=src/fzytest.o src/match.o src/choices.o |
|
| 15 |
+TESTOBJECTS=test/fzytest.c src/match.o src/choices.o |
|
| 16 | 16 |
|
| 17 | 17 |
all: fzy |
| 18 | 18 |
|
| 19 |
-fzytest: $(TESTOBJECTS) |
|
| 20 |
- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(TESTOBJECTS) |
|
| 19 |
+test/fzytest: $(TESTOBJECTS) |
|
| 20 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) |
|
| 21 | 21 |
|
| 22 | 22 |
test: check |
| 23 |
-check: fzytest |
|
| 24 |
- $(DEBUGGER) ./fzytest |
|
| 23 |
+check: test/fzytest |
|
| 24 |
+ $(DEBUGGER) ./test/fzytest |
|
| 25 | 25 |
|
| 26 | 26 |
fzy: $(OBJECTS) |
| 27 | 27 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) |
| ... | ... |
@@ -44,6 +44,6 @@ fmt: |
| 44 | 44 |
clang-format -i src/*.c src/*.h |
| 45 | 45 |
|
| 46 | 46 |
clean: |
| 47 |
- rm -f fzy fzytest src/*.o |
|
| 47 |
+ rm -f fzy test/fzytest src/*.o |
|
| 48 | 48 |
|
| 49 | 49 |
.PHONY: test check all clean install fmt |
| ... | ... |
@@ -11,8 +11,8 @@ INSTALL=install |
| 11 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| 12 | 12 |
INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 |
-OBJECTS=fzy.o match.o tty.o choices.o |
|
| 15 |
-TESTOBJECTS=fzytest.o match.o choices.o |
|
| 14 |
+OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o |
|
| 15 |
+TESTOBJECTS=src/fzytest.o src/match.o src/choices.o |
|
| 16 | 16 |
|
| 17 | 17 |
all: fzy |
| 18 | 18 |
|
| ... | ... |
@@ -30,7 +30,7 @@ fzy: $(OBJECTS) |
| 30 | 30 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 31 | 31 |
|
| 32 | 32 |
config.h: |
| 33 |
- cp config.def.h config.h |
|
| 33 |
+ cp src/config.def.h config.h |
|
| 34 | 34 |
|
| 35 | 35 |
install: fzy |
| 36 | 36 |
mkdir -p $(DESTDIR)$(BINDIR) |
| ... | ... |
@@ -41,9 +41,9 @@ install: fzy |
| 41 | 41 |
chmod 644 ${DESTDIR}${MANDIR}/man1/fzy.1
|
| 42 | 42 |
|
| 43 | 43 |
fmt: |
| 44 |
- clang-format -i *.c *.h |
|
| 44 |
+ clang-format -i src/*.c src/*.h |
|
| 45 | 45 |
|
| 46 | 46 |
clean: |
| 47 |
- rm -f fzy fzytest *.o |
|
| 47 |
+ rm -f fzy fzytest src/*.o |
|
| 48 | 48 |
|
| 49 | 49 |
.PHONY: test check all clean install fmt |
| ... | ... |
@@ -35,8 +35,10 @@ config.h: |
| 35 | 35 |
install: fzy |
| 36 | 36 |
mkdir -p $(DESTDIR)$(BINDIR) |
| 37 | 37 |
cp fzy $(DESTDIR)$(BINDIR)/ |
| 38 |
+ chmod 755 ${DESTDIR}${BINDIR}/fzy
|
|
| 38 | 39 |
mkdir -p $(DESTDIR)$(MANDIR)/man1 |
| 39 | 40 |
cp fzy.1 $(DESTDIR)$(MANDIR)/man1/ |
| 41 |
+ chmod 644 ${DESTDIR}${MANDIR}/man1/fzy.1
|
|
| 40 | 42 |
|
| 41 | 43 |
fmt: |
| 42 | 44 |
clang-format -i *.c *.h |
Apparently GNU make doesn't like adding dependencies on that style of
pattern rule specification.
This reverts part of 887a0b4294001c95187eeaeff20ad748125466d7
make now runs cleanly on default BSD make. This uglies it up a little,
but it was so close it might as well be made as widely compatible as
possible.
| ... | ... |
@@ -11,19 +11,22 @@ INSTALL=install |
| 11 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| 12 | 12 |
INSTALL_DATA=${INSTALL} -m 644
|
| 13 | 13 |
|
| 14 |
+OBJECTS=fzy.o match.o tty.o choices.o |
|
| 15 |
+TESTOBJECTS=fzytest.o match.o choices.o |
|
| 16 |
+ |
|
| 14 | 17 |
all: fzy |
| 15 | 18 |
|
| 16 |
-fzytest: fzytest.o match.o choices.o |
|
| 17 |
- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
|
| 19 |
+fzytest: $(TESTOBJECTS) |
|
| 20 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(TESTOBJECTS) |
|
| 18 | 21 |
|
| 19 | 22 |
test: check |
| 20 | 23 |
check: fzytest |
| 21 | 24 |
$(DEBUGGER) ./fzytest |
| 22 | 25 |
|
| 23 |
-fzy: fzy.o match.o tty.o choices.o |
|
| 24 |
- $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
|
| 26 |
+fzy: $(OBJECTS) |
|
| 27 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS) |
|
| 25 | 28 |
|
| 26 |
-%.o: %.c config.h |
|
| 29 |
+.c.o: config.h |
|
| 27 | 30 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 28 | 31 |
|
| 29 | 32 |
config.h: |
| ... | ... |
@@ -39,6 +42,6 @@ fmt: |
| 39 | 42 |
clang-format -i *.c *.h |
| 40 | 43 |
|
| 41 | 44 |
clean: |
| 42 |
- $(RM) fzy fzytest *.o |
|
| 45 |
+ rm -f fzy fzytest *.o |
|
| 43 | 46 |
|
| 44 | 47 |
.PHONY: test check all clean install fmt |
| ... | ... |
@@ -16,7 +16,8 @@ all: fzy |
| 16 | 16 |
fzytest: fzytest.o match.o choices.o |
| 17 | 17 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
| 18 | 18 |
|
| 19 |
-test: fzytest |
|
| 19 |
+test: check |
|
| 20 |
+check: fzytest |
|
| 20 | 21 |
$(DEBUGGER) ./fzytest |
| 21 | 22 |
|
| 22 | 23 |
fzy: fzy.o match.o tty.o choices.o |
| ... | ... |
@@ -40,4 +41,4 @@ fmt: |
| 40 | 41 |
clean: |
| 41 | 42 |
$(RM) fzy fzytest *.o |
| 42 | 43 |
|
| 43 |
-.PHONY: test all clean install fmt |
|
| 44 |
+.PHONY: test check all clean install fmt |
This reverts commit de53af7e70bdc352513cabd40dcb4872052b701b.
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
VERSION=0.2 |
| 2 | 2 |
|
| 3 |
-CPPFLAGS=-DVERSION=\"${VERSION}\"
|
|
| 4 |
-CFLAGS+=-Wall -Wextra -g -O3 -pedantic |
|
| 3 |
+CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
|
| 4 |
+CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic |
|
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
MANDIR?=$(PREFIX)/share/man |
| 7 | 7 |
BINDIR?=$(PREFIX)/bin |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
VERSION=0.2 |
| 2 | 2 |
|
| 3 |
-CPPFLAGS=-DVERSION=\"${VERSION}\" -D_GNU_SOURCE
|
|
| 4 |
-CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic |
|
| 3 |
+CPPFLAGS=-DVERSION=\"${VERSION}\"
|
|
| 4 |
+CFLAGS+=-Wall -Wextra -g -O3 -pedantic |
|
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
MANDIR?=$(PREFIX)/share/man |
| 7 | 7 |
BINDIR?=$(PREFIX)/bin |
Apologies that this uses my preferred formatting style: mostly the same
as Linux, but without a break between function and brace. Adds spaces in
a few places they weren't before.
| ... | ... |
@@ -26,9 +26,10 @@ fzy: fzy.o match.o tty.o choices.o |
| 26 | 26 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 27 | 27 |
|
| 28 | 28 |
install: fzy |
| 29 |
- $(INSTALL_PROGRAM) fzy $(DESTDIR)$(BINDIR)/fzy |
|
| 30 |
- $(INSTALL_PROGRAM) -d $(DESTDIR)$(MANDIR)/man1 |
|
| 31 |
- $(INSTALL_PROGRAM) fzy.1 $(DESTDIR)$(MANDIR)/man1/fzy.1 |
|
| 29 |
+ mkdir -p $(DESTDIR)$(BINDIR) |
|
| 30 |
+ cp fzy $(DESTDIR)$(BINDIR)/ |
|
| 31 |
+ mkdir -p $(DESTDIR)$(MANDIR)/man1 |
|
| 32 |
+ cp fzy.1 $(DESTDIR)$(MANDIR)/man1/ |
|
| 32 | 33 |
|
| 33 | 34 |
clean: |
| 34 | 35 |
$(RM) fzy fzytest *.o |
Makes it easy to run tests w/ gdb for debugging
| ... | ... |
@@ -5,7 +5,7 @@ CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic |
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
MANDIR?=$(PREFIX)/share/man |
| 7 | 7 |
BINDIR?=$(PREFIX)/bin |
| 8 |
-VALGRIND?= |
|
| 8 |
+DEBUGGER?= |
|
| 9 | 9 |
|
| 10 | 10 |
INSTALL=install |
| 11 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| ... | ... |
@@ -17,7 +17,7 @@ fzytest: fzytest.o match.o choices.o |
| 17 | 17 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
| 18 | 18 |
|
| 19 | 19 |
test: fzytest |
| 20 |
- -$(VALGRIND) ./fzytest |
|
| 20 |
+ -$(DEBUGGER) ./fzytest |
|
| 21 | 21 |
|
| 22 | 22 |
fzy: fzy.o match.o tty.o choices.o |
| 23 | 23 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
VALGRIND="valgrind --leak-check=full" make test
| ... | ... |
@@ -5,6 +5,7 @@ CFLAGS+=-Wall -Wextra -g -std=c99 -O3 -pedantic |
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
MANDIR?=$(PREFIX)/share/man |
| 7 | 7 |
BINDIR?=$(PREFIX)/bin |
| 8 |
+VALGRIND?= |
|
| 8 | 9 |
|
| 9 | 10 |
INSTALL=install |
| 10 | 11 |
INSTALL_PROGRAM=$(INSTALL) |
| ... | ... |
@@ -16,7 +17,7 @@ fzytest: fzytest.o match.o choices.o |
| 16 | 17 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
| 17 | 18 |
|
| 18 | 19 |
test: fzytest |
| 19 |
- -./fzytest |
|
| 20 |
+ -$(VALGRIND) ./fzytest |
|
| 20 | 21 |
|
| 21 | 22 |
fzy: fzy.o match.o tty.o choices.o |
| 22 | 23 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
| ... | ... |
@@ -21,12 +21,13 @@ test: fzytest |
| 21 | 21 |
fzy: fzy.o match.o tty.o choices.o |
| 22 | 22 |
$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
| 23 | 23 |
|
| 24 |
-%.o: %.c |
|
| 24 |
+%.o: %.c config.h |
|
| 25 | 25 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 26 | 26 |
|
| 27 | 27 |
install: fzy |
| 28 | 28 |
$(INSTALL_PROGRAM) fzy $(DESTDIR)$(BINDIR)/fzy |
| 29 |
- $(INSTALL_PROGRAM) -D fzy.1 $(DESTDIR)$(MANDIR)/man1/fzy.1 |
|
| 29 |
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(MANDIR)/man1 |
|
| 30 |
+ $(INSTALL_PROGRAM) fzy.1 $(DESTDIR)$(MANDIR)/man1/fzy.1 |
|
| 30 | 31 |
|
| 31 | 32 |
clean: |
| 32 | 33 |
$(RM) fzy fzytest *.o |
| ... | ... |
@@ -3,6 +3,8 @@ VERSION=0.1beta |
| 3 | 3 |
CPPFLAGS=-DVERSION=\"${VERSION}\"
|
| 4 | 4 |
CFLAGS+=-Wall -Wextra -g -std=c99 -O3 |
| 5 | 5 |
PREFIX?=/usr/local |
| 6 |
+MANDIR?=$(PREFIX)/share/man |
|
| 7 |
+BINDIR?=$(PREFIX)/bin |
|
| 6 | 8 |
|
| 7 | 9 |
INSTALL=install |
| 8 | 10 |
INSTALL_PROGRAM=$(INSTALL) |
| ... | ... |
@@ -23,7 +25,8 @@ fzy: fzy.o match.o tty.o choices.o |
| 23 | 25 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 24 | 26 |
|
| 25 | 27 |
install: fzy |
| 26 |
- $(INSTALL_PROGRAM) fzy $(DESTDIR)$(PREFIX)/bin/fzy |
|
| 28 |
+ $(INSTALL_PROGRAM) fzy $(DESTDIR)$(BINDIR)/fzy |
|
| 29 |
+ $(INSTALL_PROGRAM) -D fzy.1 $(DESTDIR)$(MANDIR)/man1/fzy.1 |
|
| 27 | 30 |
|
| 28 | 31 |
clean: |
| 29 | 32 |
$(RM) fzy fzytest *.o |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
VERSION=0.1beta |
| 2 | 2 |
|
| 3 | 3 |
CPPFLAGS=-DVERSION=\"${VERSION}\"
|
| 4 |
-CFLAGS+=-Wall -Wextra -g -std=c99 -O2 |
|
| 4 |
+CFLAGS+=-Wall -Wextra -g -std=c99 -O3 |
|
| 5 | 5 |
PREFIX?=/usr/local |
| 6 | 6 |
|
| 7 | 7 |
INSTALL=install |
| ... | ... |
@@ -11,13 +11,13 @@ INSTALL_DATA=${INSTALL} -m 644
|
| 11 | 11 |
all: fzy fzytest |
| 12 | 12 |
|
| 13 | 13 |
fzytest: fzytest.o match.o |
| 14 |
- $(CC) $(CCFLAGS) -o $@ $^ |
|
| 14 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
|
| 15 | 15 |
|
| 16 | 16 |
test: fzytest |
| 17 | 17 |
-./fzytest |
| 18 | 18 |
|
| 19 | 19 |
fzy: fzy.o match.o tty.o |
| 20 |
- $(CC) $(CCFLAGS) -o $@ $^ |
|
| 20 |
+ $(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^ |
|
| 21 | 21 |
|
| 22 | 22 |
%.o: %.c fzy.h |
| 23 | 23 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
Change-Id: If849f07175e5accfa26179b555e5f59e39b6826f
| ... | ... |
@@ -1,4 +1,9 @@ |
| 1 | 1 |
CFLAGS+=-Wall -Wextra -g -std=c99 |
| 2 |
+PREFIX?=/usr/local |
|
| 3 |
+ |
|
| 4 |
+INSTALL=install |
|
| 5 |
+INSTALL_PROGRAM=$(INSTALL) |
|
| 6 |
+INSTALL_DATA=${INSTALL} -m 644
|
|
| 2 | 7 |
|
| 3 | 8 |
all: fzy fzytest |
| 4 | 9 |
|
| ... | ... |
@@ -14,7 +19,10 @@ fzy: fzy.o match.o |
| 14 | 19 |
%.o: %.c fzy.h |
| 15 | 20 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 16 | 21 |
|
| 22 |
+install: fzy |
|
| 23 |
+ $(INSTALL_PROGRAM) fzy $(DESTDIR)$(PREFIX)/fzy |
|
| 24 |
+ |
|
| 17 | 25 |
clean: |
| 18 | 26 |
$(RM) fzy fzytest *.o |
| 19 | 27 |
|
| 20 |
-.PHONY: test all clean |
|
| 28 |
+.PHONY: test all clean install |
Ruby tests were a nice way to start, and it was nice to borrow some from
selecta. However, it's going to be much easier to write tests in the
same language as the implementation.
| ... | ... |
@@ -1,12 +1,12 @@ |
| 1 | 1 |
CFLAGS+=-Wall -Wextra -g -std=c99 |
| 2 | 2 |
|
| 3 |
-all: fzy testscore |
|
| 3 |
+all: fzy fzytest |
|
| 4 | 4 |
|
| 5 |
-testscore: testscore.o match.o |
|
| 5 |
+fzytest: fzytest.o match.o |
|
| 6 | 6 |
$(CC) $(CCFLAGS) -o $@ $^ |
| 7 | 7 |
|
| 8 |
-test: testscore |
|
| 9 |
- ruby test.rb |
|
| 8 |
+test: fzytest |
|
| 9 |
+ -./fzytest |
|
| 10 | 10 |
|
| 11 | 11 |
fzy: fzy.o match.o |
| 12 | 12 |
$(CC) $(CCFLAGS) -o $@ $^ |
| ... | ... |
@@ -15,4 +15,6 @@ fzy: fzy.o match.o |
| 15 | 15 |
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< |
| 16 | 16 |
|
| 17 | 17 |
clean: |
| 18 |
- $(RM) fzy testscore *.o |
|
| 18 |
+ $(RM) fzy fzytest *.o |
|
| 19 |
+ |
|
| 20 |
+.PHONY: test all clean |
| ... | ... |
@@ -1,10 +1,15 @@ |
| 1 |
-LIBS= |
|
| 2 | 1 |
CFLAGS+=-Wall -Wextra -g |
| 3 |
-TARGET=fzy |
|
| 4 |
-OBJECTS=fzy.o |
|
| 5 | 2 |
|
| 6 |
-$(TARGET): $(OBJECTS) |
|
| 7 |
- $(CC) $(CCFLAGS) -o $@ $^ $(LIBS) |
|
| 3 |
+all: fzy testscore |
|
| 4 |
+ |
|
| 5 |
+testscore: testscore.o match.o |
|
| 6 |
+ $(CC) $(CCFLAGS) -o $@ $^ |
|
| 7 |
+ |
|
| 8 |
+test: testscore |
|
| 9 |
+ ruby test.rb |
|
| 10 |
+ |
|
| 11 |
+fzy: fzy.o match.o |
|
| 12 |
+ $(CC) $(CCFLAGS) -o $@ $^ |
|
| 8 | 13 |
|
| 9 | 14 |
clean: |
| 10 |
- $(RM) $(TARGET) *.o |
|
| 15 |
+ $(RM) fzy testscore *.o |