From d75841ba4741795e514f335ade86d0786abaadf5 Mon Sep 17 00:00:00 2001
From: Maximilian Stiefel <stiefel.maximilian@online.de>
Date: Wed, 25 Jul 2018 12:11:16 +0200
Subject: [PATCH] Makefile mods and removed old script.

---
 Makefile                      |  7 ++++---
 compile_and_install_ubuntu.sh | 12 ------------
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100755 compile_and_install_ubuntu.sh

diff --git a/Makefile b/Makefile
index 6d4b1d7..a45634c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ CFLAGS=-Wall -c -g
 DICT_DIR=./dict
 LFLAGS=-lcurl -lcurlpp -g -Wall
 INST_FILE=/usr/local/bin/dictcc
+TARGET=dictcc
 
 dict : deen.o desv.o dict_imp.o dictcc.o make_lib
 deen.o :
@@ -14,8 +15,8 @@ dict_imp.o :
 dictcc.o :
 	$(CC) $(CFLAGS) dictcc.cc
 make_lib :
-	$(CC) dictcc.o deen.o desv.o dict_imp.o -o dictcc $(LFLAGS)
+	$(CC) dictcc.o deen.o desv.o dict_imp.o -o $(TARGET) $(LFLAGS)
 install:
-	sudo ln -s $(PWD)/dictcc $(INST_FILE)
+	sudo ln -s $(PWD)/$(TARGET) $(INST_FILE)
 clean :
-	rm *.o
+	rm *.o rm $(TARGET)
diff --git a/compile_and_install_ubuntu.sh b/compile_and_install_ubuntu.sh
deleted file mode 100755
index 4eb23ef..0000000
--- a/compile_and_install_ubuntu.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-COMPILE_CMD="g++ dict/*.cc dictcc.cc -o dictcc -lcurl -lcurlpp -g"
-INST_FILE="/usr/local/bin/dictcc"
-INST_CMD="sudo ln -s $PWD/dictcc $INST_FILE"
-echo "Compiling ... "
-$COMPILE_CMD
-echo "Installing ..."
-if [ ! -f "$INST_FILE" ]
-then
-  $INST_CMD
-fi
-rm dictcc