updated Makefile, renamed output to calp and main.c/main.o to calp.c/calp.o

6 files changed, 32 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 73283e0..50f0bac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-output
+calp
 0.pdf
 main.o
 draw.o
diff --git a/0.pdf b/0.pdf
index 0157847..8b56078 100644
--- a/0.pdf
+++ b/0.pdf
diff --git a/Makefile b/Makefile
index 67861a0..5e9411d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,25 @@
+VERSION = 0.0
+PREFIX = /usr/local
 CC = cc
 DIR = src
-OBJS = $(DIR)/draw.o $(DIR)/main.o
-CAIROI = `pkg-config --cflags -libs cairo cairo-pdf`
-.PHONY: clean all
+OBJS = $(DIR)/draw.o $(DIR)/calp.o
+LIBS = -lcairo
+.PHONY: clean all install
 
 CFLAGS = -O2 -g -Wall -Werror -Wextra -Winit-self -Wuninitialized -pedantic
 
-all: output
+all: calp
 
-output: $(OBJS)
-	$(CC) $(CAIROI) -o output $(OBJS) 
+calp: $(OBJS)
+	$(CC) $(LIBS) -o calp $(OBJS) 
 
 clean:
-	-rm -f $(OBJS) output
+	-rm -f $(OBJS) calp
+
+install: all
+	mkdir -p ${DESTDIR}${PREFIX}/bin
+	cp -f calp ${DESTDIR}${PREFIX}/bin
+	chmod 755 ${DESTDIR}${PREFIX}/bin/calp
+
+uninstall:
+	rm -f ${DESTDIR}${PREFIX}/bin/calp
diff --git a/README.md b/README.md
index 8e6b231..7f274a5 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,18 @@
 # Calp
-`calp` attempts to generate clear and attractive calendars that can be printed. 
+calp attempts to generate dry and attractive calendars that can be printed. It is designed to be extensible and customizable for a wide range of calendar designs.
 
 # Dependencies
 - `cairo`
-- `pkg-config`
 
-# Build
-- `make`
+# Install
+- `make clean install`
+
+# Uninstall
+- `make uninstall`
 
 # Planned Features
 - Arguments (`getopts`)
-- Holidays
-- Moon Phases
-- Month Art
 - Custom layout file parsing (config files)
+- Holidays (.csv files)
+- Month Art
+- Moon Phases
diff --git a/src/main.c b/src/calp.c
index 6d76a6d..278538e 100644
--- a/src/main.c
+++ b/src/calp.c
@@ -86,6 +86,7 @@ int main (void) {
 	cairo_set_line_width (cr, 0.03);
 
 
+	clock_t begin = clock();
 	draw_calendar(cr, month_origin_x, month_origin_y, dim);
 	draw_numbers(cr, month_origin_x, month_origin_y, dim, day.tm_wday, number_of_days);
 	draw_month_name(cr, months[1], dim);
@@ -93,5 +94,9 @@ int main (void) {
 	/* Clean Up */
 	cairo_destroy(cr);
 	cairo_surface_destroy(surface);
+
+	clock_t end = clock();
+	double time_spent = (double)(end - begin) / CLOCKS_PER_SEC;
+	printf("Execution Time: %.3fs\n", time_spent);
 	return(0);
 }
diff --git a/src/calp.o b/src/calp.o
new file mode 100644
index 0000000..23e90f5
--- /dev/null
+++ b/src/calp.o