summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--src/choices.c (renamed from choices.c)0
-rw-r--r--src/choices.h (renamed from choices.h)0
-rw-r--r--src/config.def.h (renamed from config.def.h)0
-rw-r--r--src/fzy.c (renamed from fzy.c)2
-rw-r--r--src/fzytest.c (renamed from fzytest.c)0
-rw-r--r--src/match.c (renamed from match.c)2
-rw-r--r--src/match.h (renamed from match.h)0
-rw-r--r--src/tty.c (renamed from tty.c)0
-rw-r--r--src/tty.h (renamed from tty.h)0
10 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index f5b488d..54591a2 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ INSTALL=install
INSTALL_PROGRAM=$(INSTALL)
INSTALL_DATA=${INSTALL} -m 644
-OBJECTS=fzy.o match.o tty.o choices.o
-TESTOBJECTS=fzytest.o match.o choices.o
+OBJECTS=src/fzy.o src/match.o src/tty.o src/choices.o
+TESTOBJECTS=src/fzytest.o src/match.o src/choices.o
all: fzy
@@ -30,7 +30,7 @@ fzy: $(OBJECTS)
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
config.h:
- cp config.def.h config.h
+ cp src/config.def.h config.h
install: fzy
mkdir -p $(DESTDIR)$(BINDIR)
@@ -41,9 +41,9 @@ install: fzy
chmod 644 ${DESTDIR}${MANDIR}/man1/fzy.1
fmt:
- clang-format -i *.c *.h
+ clang-format -i src/*.c src/*.h
clean:
- rm -f fzy fzytest *.o
+ rm -f fzy fzytest src/*.o
.PHONY: test check all clean install fmt
diff --git a/choices.c b/src/choices.c
index ba25749..ba25749 100644
--- a/choices.c
+++ b/src/choices.c
diff --git a/choices.h b/src/choices.h
index d8d547c..d8d547c 100644
--- a/choices.h
+++ b/src/choices.h
diff --git a/config.def.h b/src/config.def.h
index 98cc915..98cc915 100644
--- a/config.def.h
+++ b/src/config.def.h
diff --git a/fzy.c b/src/fzy.c
index de6535c..f5470fd 100644
--- a/fzy.c
+++ b/src/fzy.c
@@ -9,7 +9,7 @@
#include "tty.h"
#include "choices.h"
-#include "config.h"
+#include "../config.h"
static int flag_show_scores = 0;
diff --git a/fzytest.c b/src/fzytest.c
index 16a575c..16a575c 100644
--- a/fzytest.c
+++ b/src/fzytest.c
diff --git a/match.c b/src/match.c
index 9b64f01..9602700 100644
--- a/match.c
+++ b/src/match.c
@@ -7,7 +7,7 @@
#include "match.h"
-#include "config.h"
+#include "../config.h"
char *strcasechr(const char *s, char c) {
const char accept[3] = {c, toupper(c), 0};
diff --git a/match.h b/src/match.h
index 941b62e..941b62e 100644
--- a/match.h
+++ b/src/match.h
diff --git a/tty.c b/src/tty.c
index bf2bc83..bf2bc83 100644
--- a/tty.c
+++ b/src/tty.c
diff --git a/tty.h b/src/tty.h
index b5a9343..b5a9343 100644
--- a/tty.h
+++ b/src/tty.h