[freetype2] kushal-work d5f1827: updating makefile to use compiled library

[Kushal K S V S]

branch: kushal-work
commit d5f18270c5d0555d9bb47289d13a797d88daacce
Merge: 12dc54b 4f5f083
Author: Kushal K S V S <address@hidden>
Commit: Kushal K S V S <address@hidden>

    updating makefile to use compiled library
---
 tests/make_bitmap/README     | 6 ++++++
 tests/make_png/README        | 9 +++++++--
 tests/make_png/hashes/README | 1 +
 tests/make_png/images/README | 1 +
 tests/make_png/makefile      | 9 +++++----
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/tests/make_bitmap/README b/tests/make_bitmap/README
index daeaa79..285289c 100644
--- a/tests/make_bitmap/README
+++ b/tests/make_bitmap/README
@@ -1,3 +1,9 @@
+<<<<<<< HEAD
+=======
+Use the "new" folder.
+
+
+>>>>>>> 4f5f083dc68dc6f0896e8da529590e88101c3c19
 To compile and execute
 
 gcc example1.c ksvsk.c murmur3.c -Wall -I /usr/local/include/freetype2/ 
-lfreetype -o example1 
diff --git a/tests/make_png/README b/tests/make_png/README
index 677cf65..51fe304 100644
--- a/tests/make_png/README
+++ b/tests/make_png/README
@@ -1,6 +1,11 @@
+NOTE: First make freetype library (in the ../../ directory)
+  make devel
+  make 
+
+
 To generate hashes and store it in the ./hashes folder,
 
-1) sudo make hash
+1) make hash
        (set resoluton in DPI by passing argument
        example: sudo make DPI=100, if not specified,default is 72)
 
@@ -18,7 +23,7 @@ To generate hashes and store it in the ./hashes folder,
 
 To generate 32-bit RGBA PNG(s) of all glyphs in a font\n
   
-1) sudo make png
+1) make png
        (set resoluton in DPI by passing argument
        example: sudo make DPI=100, if not specified,default is 72)
 
diff --git a/tests/make_png/hashes/README b/tests/make_png/hashes/README
new file mode 100644
index 0000000..9b6ab80
--- /dev/null
+++ b/tests/make_png/hashes/README
@@ -0,0 +1 @@
+This folder includes all the hashes generated
\ No newline at end of file
diff --git a/tests/make_png/images/README b/tests/make_png/images/README
new file mode 100644
index 0000000..c769f13
--- /dev/null
+++ b/tests/make_png/images/README
@@ -0,0 +1 @@
+This folder includes all the images generated
\ No newline at end of file
diff --git a/tests/make_png/makefile b/tests/make_png/makefile
index 691a6fd..7749376 100644
--- a/tests/make_png/makefile
+++ b/tests/make_png/makefile
@@ -4,22 +4,23 @@ SHELL = /bin/sh
 
 SRC_HASH = hash_to_file.c bitmap.c murmur3.c  
 SRC_PNG = make_png.c bitmap.c murmur3.c
+SRC_LIB = ../../objs/libfreetype.a
 OBJS = $(src:.c=.o)
 
 CFLAGS = -Wall -g
 CC = gcc
-INCLUDE = -I /usr/local/include/freetype2/ 
-LIBS = -lfreetype -lpng
+INCLUDE = -I ../../include/
+LIBS = -lpng -lharfbuzz -lbz2 
 
 DPI = 72
 
 all: png hash
 
 png:$(SRC_PNG)
-       $(CC) $(CFLAGS) $(INCLUDE) -DDPI=$(DPI) -o $@  $(SRC_PNG) $(OBJS) 
$(LIBS)
+       $(CC) $(CFLAGS) $(INCLUDE) -DDPI=$(DPI) -o $@  $(SRC_PNG) $(SRC_LIB) 
$(OBJS) $(LIBS)
 
 hash:$(SRC_HASH)
-       $(CC) $(CFLAGS) $(INCLUDE) -DDPI=$(DPI) -o $@  $(SRC_HASH) $(OBJS) 
$(LIBS)
+       $(CC) $(CFLAGS) $(INCLUDE) -DDPI=$(DPI) -o $@  $(SRC_HASH) $(SRC_LIB) 
$(OBJS) $(LIBS)
 
 .PHONY: clean
 clean: