summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile44
-rw-r--r--dbhandling.c (renamed from src/dbhandling.c)0
-rw-r--r--dbhandling.h (renamed from src/dbhandling.h)0
-rw-r--r--main.c (renamed from src/main.c)0
5 files changed, 26 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore
index bef63d7..27c573e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-src/old_main.c
+old_main.c
*.csv
*.db
diff --git a/Makefile b/Makefile
index 5a0a267..d42e755 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,37 @@
-SHELL=/bin/sh
-CC=gcc
+SHELL = /bin/sh
+CC = gcc
-SRCDIR=./src
-PREFIX=/usr/local
-BINDIR=/bin
+PREFIX = /usr/local
+BINDIR = /bin
-INSTALL_PROGRAM=install
-INSTALL_DATA=install -m 644
+INSTALL_PROGRAM = install
+INSTALL_DATA = install -m 644
-CFLAGS=-Wall -Wextra
-LIBS=-lsqlite3
-BIN=myal
+CFLAGS = -Wall -Wextra
+LIBS = -lsqlite3
+SRC = main.c dbhandling.c
+OBJ = ${SRC:.c=.o}
+BIN = myal
-all: $(BIN)
+all: options ${BIN}
-myal: $(SRCDIR)/main.c dbhandling
- $(CC) $(CFLAGS) $(LIBS) $(SRCDIR)/main.c dbhandling.o -o myal
+options:
+ @echo myal build options:
+ @echo "CFLAGS = ${CFLAGS}"
+ @echo "CC = ${CC}"
-dbhandling: $(SRCDIR)/dbhandling.c
- $(CC) $(CFLAGS) $(LIBS) -c $(SRCDIR)/dbhandling.c
+.c.o:
+ ${CC} -c ${CFLAGS} ${SRC}
+
+myal: .c.o
+ ${CC} ${CFLAGS} ${LIBS} ${OBJ} -o myal
install:
- $(INSTALL_PROGRAM) myal $(PREFIX)$(BINDIR)/myal
+ ${INSTALL_PROGRAM} myal ${PREFIX}${BINDIR}/myal
clean:
- $(RM) myal
- $(RM) dbhandling.o
+ ${RM} myal
+ ${RM} ${OBJ}
uninstall:
- $(RM) /usr/local/bin/myal
+ ${RM} /usr/local/bin/myal
diff --git a/src/dbhandling.c b/dbhandling.c
index 778c147..778c147 100644
--- a/src/dbhandling.c
+++ b/dbhandling.c
diff --git a/src/dbhandling.h b/dbhandling.h
index 4f09852..4f09852 100644
--- a/src/dbhandling.h
+++ b/dbhandling.h
diff --git a/src/main.c b/main.c
index b38733b..b38733b 100644
--- a/src/main.c
+++ b/main.c