Restructure Makefile

Author: btrkeks

Makefile

@@ -1,45 +1,33 @@
 .POSIX:
 .SUFFIXES:
+CC=gcc
 PREFIX=/usr/local
 MANPREFIX = ${PREFIX}/share/man
+
 IDIR=include
 SDIR=src
-LIBDIR=lib
-CC=gcc
-CPPFLAGS=-D_POSIX_C_SOURCE=200809L -DNOTIFICATIONS
-CFLAGS= ${CPPFLAGS} -I$(IDIR)  \
-       $(shell pkg-config --cflags gtk+-3.0) $(shell pkg-config --cflags libnotify)
-DEBUG_CFLAGS=-DDEBUG -g3 -Wall -Wextra -Wpedantic -Wstrict-prototypes -Wdouble-promotion -Wshadow \
-	     -Wno-unused-parameter -Wno-sign-conversion -Wno-unused-function \
-	     -fsanitize=undefined,address -fsanitize-undefined-trap-on-error
-# DEBUG_CFLAGS+=-Wconversion
-# DEBUG_CFLAGS+=-fanalyzer
-RELEASE_CFLAGS=-O3 -flto -march=native
+LDIR=lib
 
+CPPFLAGS=-D_POSIX_C_SOURCE=200809L -DNOTIFICATIONS -I$(IDIR)
 LDLIBS=-ffunction-sections -fdata-sections -Wl,--gc-sections \
        -lcurl -lmecab -pthread $(shell pkg-config --libs gtk+-3.0) $(shell pkg-config --libs libnotify) -llmdb
 
-FILES=popup.c util.c platformdep.c deinflector.c settings.c dbreader.c ankiconnectc.c database.c jppron.c pdjson.c
-FILES_H=ankiconnectc.h dbreader.h deinflector.h popup.h settings.h util.h platformdep.h database.h jppron.h pdjson.h
-
-# LMDB_FILES = $(LIBDIR)/lmdb/libraries/liblmdb/mdb.c $(LIBDIR)/lmdb/libraries/liblmdb/midl.c
-SRC=$(addprefix $(SDIR)/,$(FILES)) $(LMDB_FILES)
-SRC_H=$(addprefix $(IDIR)/,$(FILES_H))
-
 O_HAVEX11 := 1  # X11 integration
 ifeq ($(strip $(O_HAVEX11)),1)
 	CPPFLAGS += -DHAVEX11
 	LDLIBS += -lXfixes -lX11
 endif
 
-default: release
-release: dictpopup_release dictpopup-create_release
-debug: dictpopup_debug dictpopup-create_debug
+CFLAGS= ${CPPFLAGS} $(shell pkg-config --cflags gtk+-3.0) $(shell pkg-config --cflags libnotify)
+DEBUG_CFLAGS=-DDEBUG -g3 -Wall -Wextra -Wpedantic -Wstrict-prototypes -Wdouble-promotion -Wshadow \
+	     -Wno-unused-parameter -Wno-sign-conversion -Wno-unused-function \
+	     -fsanitize=undefined,address -fsanitize-undefined-trap-on-error
+RELEASE_CFLAGS=-O3 -flto -march=native
 
-dictpopup_release: $(SRC) $(SRC_H)
-	$(CC) -o dictpopup src/dictpopup.c $(CFLAGS) $(RELEASE_CFLAGS) $(LDLIBS) $(SRC)
-dictpopup_debug: $(SRC) $(SRC_H)
-	$(CC) -o dictpopup src/dictpopup.c $(CFLAGS) $(DEBUG_CFLAGS) $(LDLIBS) $(SRC)
+FILES=popup.c util.c platformdep.c deinflector.c settings.c dbreader.c ankiconnectc.c database.c jppron.c pdjson.c
+FILES_H=ankiconnectc.h dbreader.h deinflector.h popup.h settings.h util.h platformdep.h database.h jppron.h pdjson.h
+SRC=$(addprefix $(SDIR)/,$(FILES))
+SRC_H=$(addprefix $(IDIR)/,$(FILES_H))
 
 
 CFLAGS_CREATE=-I$(IDIR) -isystem$(LIBDIR)/lmdb/libraries/liblmdb -D_POSIX_C_SOURCE=200809L $(shell pkg-config --cflags glib-2.0)
@@ -52,11 +40,22 @@ FILES_H_CREATE=dbwriter.h pdjson.h util.h buf.h settings.h
 SRC_CREATE=$(addprefix $(SDIR)/,$(FILES_CREATE))  $(LMDB_FILES)
 SRC_H_CREATE=$(addprefix $(IDIR)/,$(FILES_H_CREATE))
 
-dictpopup-create_release: $(SRC_CREATE) $(SRC_H_CREATE)
-	$(CC) -o dictpopup-create src/dictpopup_create.c $(CFLAGS_CREATE) $(RELEASE_CFLAGS) $(LDLIBS_CREATE) $(SRC_CREATE)
+default: dictpopup dictpopup-create
+debug: dictpopup-debug dictpopup-create-debug
+
+dictpopup: $(SRC) $(SRC_H)
+	$(CC) $(CFLAGS) $(RELEASE_CFLAGS) -o $@ src/dictpopup.c $(SRC) $(LDLIBS)
+dictpopup-debug: $(SRC) $(SRC_H)
+	$(CC) $(CFLAGS) $(DEBUG_CFLAGS) -o $@ src/dictpopup.c $(SRC) $(LDLIBS)
+
+dictpopup-create: $(SRC_CREATE) $(SRC_H_CREATE)
+	$(CC) $(CFLAGS_CREATE) $(RELEASE_CFLAGS) -o $@ src/dictpopup_create.c $(SRC_CREATE) $(LDLIBS_CREATE)
+dictpopup-create-debug: $(SRC_CREATE) $(SRC_H_CREATE)
+	$(CC) $(CFLAGS_CREATE) $(DEBUG_CFLAGS) -o $@ src/dictpopup_create.c $(SRC_CREATE) $(LDLIBS_CREATE)
 
-dictpopup-create_debug: $(SRC_CREATE) $(SRC_H_CREATE)
-	$(CC) -o dictpopup-create src/dictpopup_create.c $(CFLAGS_CREATE) $(DEBUG_CFLAGS) $(LDLIBS_CREATE) $(SRC_CREATE) $(SRC_H_CREATE)
+release:
+	version=$$(git describe); prefix=dictpopup-$${version#v}; \
+	  git archive --prefix=$$prefix/ HEAD | gzip -9 >$$prefix.tar.gz
 
 CONFIG_DIR=${DESTDIR}${PREFIX}/share/dictpopup
 
@@ -85,8 +84,10 @@ uninstall:
 clean:
 	rm -f dictpopup dictpopup-create test
 
-test: $(SRC) $(SRC_H)
-	gcc -o test $(SDIR)/test.c $(CFLAGS) $(LDLIBS) $(SRC)
+tests: $(SRC) $(SRC_H)
+	$(CC) $(CFLAGS) $(DEBUG_CFLAGS) -o $@ $(SDIR)/test.c $(SRC) $(LDLIBS)
 
+check test: tests
+	./tests
 
-.PHONY: clean install uninstall test debug
+.PHONY: all clean install uninstall tests debug