summaryrefslogtreecommitdiff
blob: 31e7f796a611a7f0978f083223a1d6ee6905ea45 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
--- mkfiles.pl.old	2010-03-07 11:14:11.000000000 -0300
+++ mkfiles.pl	2010-03-07 11:24:20.000000000 -0300
@@ -1110,8 +1110,8 @@
     "\n".
     &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " .
 	       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-	       " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n".
-    "XLIBS = `\$(GTK_CONFIG) --libs`\n".
+	       " `pkg-config gtk+-2.0 --cflags` \$(CFLAGS)")."\n".
+    "XLIBS = `pkg-config gtk+-2.0 --libs`\n".
     "ULIBS =#\n".
     "INSTALL=install\n",
     "INSTALL_PROGRAM=\$(INSTALL)\n",
@@ -1130,7 +1130,7 @@
       $objstr = &objects($p, "X.o", undef, undef);
       print &splitline($prog . ": " . $objstr), "\n";
       $libstr = &objects($p, undef, undef, "-lX");
-      print &splitline("\t\$(CC) -o \$@ $objstr $libstr \$(${type}LIBS)", 69),
+      print &splitline("\t\$(CC) \$(LDFLAGS) -o \$@ $objstr $libstr \$(${type}LIBS)", 69),
 	  "\n\n";
     }
     foreach $d (&deps("X.o", undef, $dirpfx, "/")) {