blob: bc262e325c5e73031f7580cde9cc422927d1b41e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
unchanged:
--- Makefile 2007-06-09 10:43:16.000000000 -0400
+++ ./fbtruetype/Makefile 2014-09-11 09:18:41.067044105 -0400
@@ -19,16 +19,14 @@
LIBDIR = $(PREFIX)/$(LIB)
-PROGRAMS = fbtruetype fbtruetype.static
+PROGRAMS = fbtruetype
OBJECTS = fbtruetype.o messages.o console.o ttf.o luxisri.o
LDFLAGS += -L$(LIBDIR)
-LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm
LIBSD = -lfreetype -lm
CFLAGS += -I/usr/include/freetype2
COMPILE = $(CC) $(CFLAGS)
-LINKS = $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@
LINKD = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INSTALL_PROG = install
@@ -47,20 +45,16 @@
mostlyclean:
-rm -f *.o core
clean: mostlyclean
- -rm -f fbtruetype fbtruetype.static
+ -rm -f fbtruetype
fbtruetype: $(OBJECTS)
@rm -f fbtruetype
$(LINKD) $(LDFLAGS) $(OBJECTS) $(LIBSD)
-fbtruetype.static: $(OBJECTS)
- @rm -f fbtruetype.static
- $(LINKS) $(LDFLAGS) $(OBJECTS) $(LIBSS)
install:
- $(INSTALL_PROG) -D fbtruetype $(DESTDIR)/sbin/fbtruetype
- $(INSTALL_PROG) -D fbtruetype.static $(DESTDIR)/sbin/fbtruetype.static
+ $(INSTALL_PROG) -D fbtruetype $(DESTDIR)/bin/fbtruetype
strip: $(PROGRAMS)
$(STRIP) -s $(PROGRAMS)
-.PHONY: mostlyclean clean fbtruetype fbtruetype.static all strip
+.PHONY: mostlyclean clean fbtruetype all strip
only in patch2:
unchanged:
--- ./fbtruetype/ttf.c 2006-02-03 10:10:41.000000000 -0500
+++ ./fbtruetype/ttf.c 2014-09-11 09:07:32.005039477 -0400
@@ -13,8 +13,8 @@
#include <ft2build.h>
#include FT_FREETYPE_H
/* #include <freetype/freetype.h> */
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
+#include FT_OUTLINE_H
+#include FT_TRUETYPE_IDS_H
#include "ttf.h"
|