]>
Commit | Line | Data |
---|---|---|
2919c630 JB |
1 | --- freetype-1.3.1/lib/arch/unix/Makefile.in.orig 2009-10-08 16:52:49.474105192 +0200 |
2 | +++ freetype-1.3.1/lib/arch/unix/Makefile.in 2009-10-08 16:57:56.747409015 +0200 | |
3 | @@ -126,6 +126,7 @@ | |
4 | # C flags | |
5 | CFLAGS = @CFLAGS@ @XX_CFLAGS@ | |
6 | CPPFLAGS = @CPPFLAGS@ | |
7 | +LDFLAGS = @LDFLAGS@ | |
8 | FT_CFLAGS = $(CFLAGS) $(INCLUDES) | |
9 | ||
10 | # linker flags | |
11 | @@ -195,7 +196,7 @@ | |
12 | $(SRC_S) | |
13 | ||
14 | libttf.la: $(LIB_FILES) | |
15 | - $(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \ | |
16 | + $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libttf.la $(LIB_FILES) \ | |
17 | -rpath $(libdir) \ | |
18 | -version-info $(version_info) $(FT_LIBS) | |
19 | ||
20 | --- freetype-1.3.1/test/arch/unix/Makefile.in.orig 2009-10-08 16:52:49.472228742 +0200 | |
21 | +++ freetype-1.3.1/test/arch/unix/Makefile.in 2009-10-08 17:01:06.184056330 +0200 | |
22 | @@ -30,9 +30,10 @@ | |
23 | ||
24 | CFLAGS = @CFLAGS@ @X_CFLAGS@ @XX_CFLAGS@ | |
25 | CPPFLAGS = @CPPFLAGS@ | |
26 | +LDFLAGS = @LDFLAGS@ | |
27 | FT_CFLAGS = $(INCDIRS) $(CFLAGS) $(CPPFLAGS) -DX11 -DLOCALEDIR='"@LOCALEDIR@"' | |
28 | ||
29 | -FT_LIBS = @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @LIBS@ | |
30 | +FT_LIBS = @X_LIBS@ @X_EXTRA_LIBS@ @LIBS@ | |
31 | ||
32 | SRC = $(srcdir)/arabic.c \ | |
33 | $(srcdir)/common.c \ | |
34 | @@ -62,7 +63,7 @@ | |
35 | ||
36 | # variables used to compile either with libtool or not | |
37 | # | |
38 | -PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) | |
39 | +PROCESS = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(FT_CFLAGS) | |
40 | #PROCESS = $(CC) $(FT_CFLAGS) | |
41 | ||
42 | LIBTTF = $(top_builddir)/lib/libttf.la |