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
|
Description: no PATH_XTRA
Don't configure for PATH_XTRA, but link to freetype2.
Author: NIIBE Yutaka <gniibe@fsij.org>
Reviewed-By: NIIBE Yutaka <gniibe@fsij.org>
Last-Update: 2013-01-21
--- a/glgd/Makefile.in
+++ b/glgd/Makefile.in
@@ -29,9 +29,9 @@
# NB: cc and various flags must match the ones used to compile Gauche,
# so the make invocator shouldn't casually override them.
CC = @CC@
-CFLAGS = @DEFS@ @CFLAGS@ @X_CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
+CFLAGS = @DEFS@ @CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
LDFLAGS = $(GTKGL_LDFLAGS) @LDFLAGS@ `gauche-config -L` `gauche-config --so-ldflags`
-LIBS = $(GTKGL_LIBS) @LIBS@ `gauche-config -l` @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11
+LIBS = $(GTKGL_LIBS) @LIBS@ `gauche-config -l`
GOSH = @GOSH@
GAUCHE_CONFIG = @GAUCHE_CONFIG@
INSTALL = @GAUCHE_INSTALL@
@@ -47,6 +47,8 @@
GTKGL_LDFLAGS = `pkg-config --libs-only-L gtkglext-1.0`
GTKGL_LIBS = $(PANGOFT2) `pkg-config --libs-only-l gtkglext-1.0`
+FREETYPE_CFLAGS = `pkg-config --cflags freetype2`
+
ARCHFILES = gauche-glgd.$(SOEXT)
SCMFILES = glgd.scm
SCMFILEDIR = $(top_srcdir)/lib/gtk
--- a/gtkgl/Makefile.in
+++ b/gtkgl/Makefile.in
@@ -28,9 +28,9 @@
# NB: cc and various flags must match the ones used to compile Gauche,
# so the make invocator shouldn't casually override them.
CC = @CC@
-CFLAGS = @DEFS@ @CFLAGS@ @X_CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
+CFLAGS = @DEFS@ @CFLAGS@ `gauche-config -I` `gauche-config --so-cflags` $(GTKGL_CFLAGS)
LDFLAGS = $(GTKGL_LDFLAGS) @LDFLAGS@ `gauche-config -L` `gauche-config --so-ldflags`
-LIBS = $(GTKGL_LIBS) @LIBS@ `gauche-config -l` @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11
+LIBS = $(GTKGL_LIBS) @LIBS@ `gauche-config -l`
GOSH = @GOSH@
GAUCHE_CONFIG = @GAUCHE_CONFIG@
INSTALL = @GAUCHE_INSTALL@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -29,9 +29,9 @@
# NB: cc and various flags must match the ones used to compile Gauche,
# so the make invocator shouldn't casually override them.
CC = @CC@
-CFLAGS = @DEFS@ @CFLAGS@ @X_CFLAGS@ -I. `gauche-config -I` `gauche-config --so-cflags` $(GTK_CFLAGS)
+CFLAGS = @DEFS@ @CFLAGS@ -I. `gauche-config -I` `gauche-config --so-cflags` $(GTK_CFLAGS)
LDFLAGS = $(GTK_LDFLAGS) @LDFLAGS@ `gauche-config -L` `gauche-config --so-ldflags`
-LIBS = $(GTK_LIBS) @LIBS@ `gauche-config -l` @X_LIBS@ @X_PRE_LIBS@ -lXext -lX11
+LIBS = $(GTK_LIBS) @LIBS@ `gauche-config -l`
GOSH = @GOSH@
GAUCHE_CONFIG = @GAUCHE_CONFIG@
INSTALL = @GAUCHE_INSTALL@
|
