Convert to use pkg-config rather than gtk-config. (#53375, Skip Montanaro)

Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>

	* examples/**/Makefile.am: Convert to use pkg-config
	rather than gtk-config. (#53375, Skip Montanaro)

diff --git a/ChangeLog b/ChangeLog
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d683f6d147652defa0867423f9c762d5856989af..5c05a90f39c445acc7483efd6c380dfcae005f09 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Nov  2 10:21:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * examples/**/Makefile.am: Convert to use pkg-config
+       rather than gtk-config. (#53375, Skip Montanaro)
+
 2001-11-02  Matt Wilson  <msw@redhat.com>
 
        * gtk/gtkdialog.c (find_child_by_response_id): remove totally

diff --git a/examples/arrow/Makefile b/examples/arrow/Makefile
index 1430c18141fd7f3cb03251aa4f3ce70cf7f49feb..34904d491b3614971519dda15eb9427f500656e2 100644 (file)
--- a/examples/arrow/Makefile
+++ b/examples/arrow/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 arrow: arrow.c 
-       $(CC) `gtk-config --cflags`  arrow.c -o arrow `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  arrow.c -o arrow `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o arrow

diff --git a/examples/aspectframe/Makefile b/examples/aspectframe/Makefile
index 0fed8f559adc48526fba0f116c65bce443ad632c..1e7f3f5688e7cc9265529ffa72c2992464342171 100644 (file)
--- a/examples/aspectframe/Makefile
+++ b/examples/aspectframe/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 aspectframe: aspectframe.c 
-       $(CC) `gtk-config --cflags`  aspectframe.c -o aspectframe `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  aspectframe.c -o aspectframe `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o aspectframe

diff --git a/examples/base/Makefile b/examples/base/Makefile
index c6a3b9057b6f5f3192fc3a622379a6a479356db2..6865097f54c5728845842727acb6e63b05fa9c80 100644 (file)
--- a/examples/base/Makefile
+++ b/examples/base/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 base: base.c 
-       $(CC) `gtk-config --cflags`  base.c -o base `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  base.c -o base `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o base

diff --git a/examples/buttonbox/Makefile b/examples/buttonbox/Makefile
index 4457ff3fc6150f12fd4f994295cd28a5a58b35d1..d28bd8d9a4882be2a084ed932968ea9c6bcfa2dd 100644 (file)
--- a/examples/buttonbox/Makefile
+++ b/examples/buttonbox/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 buttonbox: buttonbox.c 
-       $(CC) `gtk-config --cflags`  buttonbox.c -o buttonbox `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  buttonbox.c -o buttonbox `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o buttonbox

diff --git a/examples/buttons/Makefile b/examples/buttons/Makefile
index 1c918e5ba5038f60de9109f11e97b67c2755cc87..a8474ae2d24068c906ace47393a769e359009466 100644 (file)
--- a/examples/buttons/Makefile
+++ b/examples/buttons/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 buttons: buttons.c 
-       $(CC) `gtk-config --cflags`  buttons.c -o buttons `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  buttons.c -o buttons `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o buttons

diff --git a/examples/calendar/Makefile b/examples/calendar/Makefile
index 8929b48509b62ea7249d4eb41139d42505872475..e260fa07dcf3c15929b30165802ddd09ddd3a840 100644 (file)
--- a/examples/calendar/Makefile
+++ b/examples/calendar/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 calendar: calendar.c
-       $(CC) `gtk-config --cflags` calendar.c -o calendar `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0` calendar.c -o calendar `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f calendar

diff --git a/examples/clist/Makefile b/examples/clist/Makefile
index c4cecd65c8885274d2a97a0052f9b3695ca7041a..cdb294811c5a5fb2fd7d7869330c81454ee91fca 100644 (file)
--- a/examples/clist/Makefile
+++ b/examples/clist/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 clist: clist.c 
-       $(CC) `gtk-config --cflags`  clist.c -o clist `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  clist.c -o clist `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o clist

diff --git a/examples/entry/Makefile b/examples/entry/Makefile
index 9958842ca368a520ff13ae82d678d6e778da1e38..ef5b67ef793fc7aa3c22e1631c391012b772b3cc 100644 (file)
--- a/examples/entry/Makefile
+++ b/examples/entry/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 entry: entry.c 
-       $(CC) `gtk-config --cflags`  entry.c -o entry `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  entry.c -o entry `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o entry

diff --git a/examples/eventbox/Makefile b/examples/eventbox/Makefile
index 5a892170935c8d6cfc058ec9326c8d9b296534a4..3eb24d5ce401fb22e519bc93bce969f06540cb51 100644 (file)
--- a/examples/eventbox/Makefile
+++ b/examples/eventbox/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 eventbox: eventbox.c 
-       $(CC) `gtk-config --cflags`  eventbox.c -o eventbox `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  eventbox.c -o eventbox `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o eventbox

diff --git a/examples/filesel/Makefile b/examples/filesel/Makefile
index 92968a1ad6cfe2a55744d9cb1eb665ef5ce27224..fe13786831334243704d368ea31491f89ba130d7 100644 (file)
--- a/examples/filesel/Makefile
+++ b/examples/filesel/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 filesel: filesel.c 
-       $(CC) `gtk-config --cflags`  filesel.c -o filesel `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  filesel.c -o filesel `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o filesel

diff --git a/examples/fixed/Makefile b/examples/fixed/Makefile
index c7fc2474eb907756ce8ceca900a0de8c0643d8b9..4fe88024bd74b819cdad4d91dca6d6546b548397 100644 (file)
--- a/examples/fixed/Makefile
+++ b/examples/fixed/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 fixed: fixed.c 
-       $(CC) `gtk-config --cflags`  fixed.c -o fixed `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  fixed.c -o fixed `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o fixed

diff --git a/examples/frame/Makefile b/examples/frame/Makefile
index 0afdbf2aa15d020f991abd0829df6db9918de58a..b8e389ab7d759aa68332fa1789a724716a4c4186 100644 (file)
--- a/examples/frame/Makefile
+++ b/examples/frame/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 frame: frame.c 
-       $(CC) `gtk-config --cflags`  frame.c -o frame `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  frame.c -o frame `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o frame

diff --git a/examples/gtkdial/Makefile b/examples/gtkdial/Makefile
index aef3850e0ad369edcf4182f76e70cfa7d68a1cf5..1c388104e2b49bacf221705e48c8536e543c880a 100644 (file)
--- a/examples/gtkdial/Makefile
+++ b/examples/gtkdial/Makefile
@@ -2,13 +2,13 @@
 CC = gcc
 
 dial_test: gtkdial.o dial_test.o
-       $(CC) dial_test.o gtkdial.o -o dial_test `gtk-config --libs`
+       $(CC) dial_test.o gtkdial.o -o dial_test `pkg-config --libs gtk+-2.0`
 
 dial_test.o: dial_test.c gtkdial.h
-       $(CC) `gtk-config --cflags` -c dial_test.c -o dial_test.o
+       $(CC) `pkg-config --cflags gtk+-2.0` -c dial_test.c -o dial_test.o
 
 gtkdial.o: gtkdial.c gtkdial.h
-       $(CC) `gtk-config --cflags` -c gtkdial.c -o gtkdial.o
+       $(CC) `pkg-config --cflags gtk+-2.0` -c gtkdial.c -o gtkdial.o
 
 clean: 
        rm -f *.o dial_test

diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile
index fc25f04f6126b5858d33f4e29d8708a9ef183c99..1a60bc6e4ded8804ca49573e948ead9522b3f272 100644 (file)
--- a/examples/helloworld/Makefile
+++ b/examples/helloworld/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 helloworld: helloworld.c 
-       $(CC) `gtk-config --cflags`  helloworld.c -o helloworld `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  helloworld.c -o helloworld `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o helloworld

diff --git a/examples/helloworld2/Makefile b/examples/helloworld2/Makefile
index db11296b939c747d668b0f4502c27755dc526a7e..d1433bcb95b7ec0da9f5df041717b45d8404b3b5 100644 (file)
--- a/examples/helloworld2/Makefile
+++ b/examples/helloworld2/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 helloworld2: helloworld2.c 
-       $(CC) `gtk-config --cflags`  helloworld2.c -o helloworld2 `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  helloworld2.c -o helloworld2 `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o helloworld2

diff --git a/examples/label/Makefile b/examples/label/Makefile
index a5b299845edc16fcd15f1c357862d163635db1b4..3cf6d95736842d051a4be4993ddcf76d222e4c87 100644 (file)
--- a/examples/label/Makefile
+++ b/examples/label/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 label: label.c 
-       $(CC) `gtk-config --cflags`  label.c -o label `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  label.c -o label `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o label

diff --git a/examples/list/Makefile b/examples/list/Makefile
index 366d4803022cca944211120d906847e0e0062b26..33e5765b856d1f344e1095eda28c4b9b9a0c673a 100644 (file)
--- a/examples/list/Makefile
+++ b/examples/list/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 list: list.c 
-       $(CC) `gtk-config --cflags`  list.c -o list `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  list.c -o list `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o list

diff --git a/examples/menu/Makefile b/examples/menu/Makefile
index 4b94bb99b936ddd2dd9d36aa431b05b924b4d89e..8c4489ce408d1bc2c7df6fa7cd6fc8e761b256da 100644 (file)
--- a/examples/menu/Makefile
+++ b/examples/menu/Makefile
@@ -4,10 +4,10 @@ CC = gcc
 all: menu itemfactory
 
 menu: menu.c 
-       $(CC) `gtk-config --cflags` menu.c -o menu `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0` menu.c -o menu `pkg-config --libs gtk+-2.0`
 
 itemfactory: itemfactory.c
-       $(CC) `gtk-config --cflags` itemfactory.c -o itemfactory `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0` itemfactory.c -o itemfactory `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o menu itemfactory

diff --git a/examples/notebook/Makefile b/examples/notebook/Makefile
index b831d3380e95dc389c7f3fbb5abc95e4a8bcf17a..fcfda957f8a6fccea1ce949865e129d149286903 100644 (file)
--- a/examples/notebook/Makefile
+++ b/examples/notebook/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 notebook: notebook.c 
-       $(CC) `gtk-config --cflags`  notebook.c -o notebook `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  notebook.c -o notebook `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o notebook

diff --git a/examples/packbox/Makefile b/examples/packbox/Makefile
index 503cf75a63e2d19d4c6f53840ff6f2f8113bcb29..b61a8fc8d50522de311d5b44e832716aa09badd3 100644 (file)
--- a/examples/packbox/Makefile
+++ b/examples/packbox/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 packbox: packbox.c 
-       $(CC) `gtk-config --cflags`  packbox.c -o packbox `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  packbox.c -o packbox `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o packbox

diff --git a/examples/packer/Makefile b/examples/packer/Makefile
index f2cb96052e0125879d7d8ab7007288c8e521ed21..152f28938c8771cb42e6bba579659a42c2eec451 100644 (file)
--- a/examples/packer/Makefile
+++ b/examples/packer/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 packer: pack.c 
-       $(CC) `gtk-config --cflags`  pack.c -o packer `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  pack.c -o packer `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o packer

diff --git a/examples/paned/Makefile b/examples/paned/Makefile
index 4f5f7f06a2c689f58a4878aed643aaf6fae75c1f..dc894a2898d9a150c37d500197533f4e50deda8b 100644 (file)
--- a/examples/paned/Makefile
+++ b/examples/paned/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 paned: paned.c 
-       $(CC) `gtk-config --cflags`  paned.c -o paned `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  paned.c -o paned `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o paned

diff --git a/examples/pixmap/Makefile b/examples/pixmap/Makefile
index 9d99ca271f1c4e2531299ae5d1a6f1be27132eed..7e421f7cb5f434b0c62ecbe55eeb944d8910ff0d 100644 (file)
--- a/examples/pixmap/Makefile
+++ b/examples/pixmap/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 pixmap: pixmap.c 
-       $(CC) `gtk-config --cflags`  pixmap.c -o pixmap `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  pixmap.c -o pixmap `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o pixmap

diff --git a/examples/progressbar/Makefile b/examples/progressbar/Makefile
index da4e4c4ae77ec3cc5d29f5ac1737c95efea692d1..4190416192ff6b44c6bbc4912a81fcb8b36c65aa 100644 (file)
--- a/examples/progressbar/Makefile
+++ b/examples/progressbar/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 progressbar: progressbar.c 
-       $(CC) `gtk-config --cflags`  progressbar.c -o progressbar `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  progressbar.c -o progressbar `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o progressbar

diff --git a/examples/radiobuttons/Makefile b/examples/radiobuttons/Makefile
index a3417bd2ccc6126ab93f60fb9a1b0a8ac92555eb..c62cfad4cb7c525c23fa8d9d992abd6ae76fc723 100644 (file)
--- a/examples/radiobuttons/Makefile
+++ b/examples/radiobuttons/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 radiobuttons: radiobuttons.c 
-       $(CC) `gtk-config --cflags`  radiobuttons.c -o radiobuttons `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  radiobuttons.c -o radiobuttons `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o radiobuttons

diff --git a/examples/rangewidgets/Makefile b/examples/rangewidgets/Makefile
index 97ff145589e68da2d88e50a7833046b11bb9a409..f0e59666ba2da24e77bcfecd80cd8ecbf5c5d5c5 100644 (file)
--- a/examples/rangewidgets/Makefile
+++ b/examples/rangewidgets/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 rangewidgets: rangewidgets.c 
-       $(CC) `gtk-config --cflags`  rangewidgets.c -o rangewidgets `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  rangewidgets.c -o rangewidgets `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o rangewidgets

diff --git a/examples/rulers/Makefile b/examples/rulers/Makefile
index 6c93491b04791be7fefbe5329c582c3b1f36df0b..d4eb71b40b7cd74bdd0a7d02dcce054b049c1624 100644 (file)
--- a/examples/rulers/Makefile
+++ b/examples/rulers/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 rulers: rulers.c 
-       $(CC) `gtk-config --cflags`  rulers.c -o rulers `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  rulers.c -o rulers `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o rulers

diff --git a/examples/scribble-simple/Makefile b/examples/scribble-simple/Makefile
index 4a60e7fbba711a2ad96e079c45a66b7b344c5616..4ded4c99286ef105156c198a81b14419d254147e 100644 (file)
--- a/examples/scribble-simple/Makefile
+++ b/examples/scribble-simple/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 scribble-simple: scribble-simple.c 
-       $(CC) `gtk-config --cflags`  scribble-simple.c -o scribble-simple `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  scribble-simple.c -o scribble-simple `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o scribble-simple

diff --git a/examples/scribble-xinput/Makefile b/examples/scribble-xinput/Makefile
index 008575c04bdd7eab18c86a3e89cde786a0f87d34..5d38b2a0fc53628661f46a5212e3f5869323a2e5 100644 (file)
--- a/examples/scribble-xinput/Makefile
+++ b/examples/scribble-xinput/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 scribble-xinput: scribble-xinput.c 
-       $(CC) `gtk-config --cflags`  scribble-xinput.c -o scribble-xinput `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  scribble-xinput.c -o scribble-xinput `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o scribble-xinput

diff --git a/examples/scrolledwin/Makefile b/examples/scrolledwin/Makefile
index 0dbc532840370e84c4b39c5391064005d3014d00..ae74e82830cc544991124d8c187f0c8ebe211ff7 100644 (file)
--- a/examples/scrolledwin/Makefile
+++ b/examples/scrolledwin/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 scrolledwin: scrolledwin.c 
-       $(CC) `gtk-config --cflags`  scrolledwin.c -o scrolledwin `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  scrolledwin.c -o scrolledwin `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o scrolledwin

diff --git a/examples/selection/Makefile b/examples/selection/Makefile
index c53cec3b625f4051c4d35873a77e9d52b8fa37f0..fad63ff099f5c58ffcd60785c2c5167ffcab29c0 100644 (file)
--- a/examples/selection/Makefile
+++ b/examples/selection/Makefile
@@ -4,10 +4,10 @@ CC = gcc
 all: gettargets setselection
 
 gettargets: gettargets.c 
-       $(CC) `gtk-config --cflags` gettargets.c -o gettargets `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0` gettargets.c -o gettargets `pkg-config --libs gtk+-2.0`
 
 setselection: setselection.c
-       $(CC) `gtk-config --cflags` setselection.c -o setselection `gtk-config --libs`
- 
+       $(CC) `pkg-config --cflags gtk+-2.0` setselection.c -o setselection `pkg-config --libs gtk+-2.0`
+
 clean: 
        rm -f *.o gettargets setselection

diff --git a/examples/spinbutton/Makefile b/examples/spinbutton/Makefile
index 255189a0dcc2176355ea2eeb3eb57fa0781528f0..8963922d4af877514a2841c07a3448e55e9dd540 100644 (file)
--- a/examples/spinbutton/Makefile
+++ b/examples/spinbutton/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 spinbutton: spinbutton.c 
-       $(CC) `gtk-config --cflags`  spinbutton.c -o spinbutton `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  spinbutton.c -o spinbutton `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o spinbutton

diff --git a/examples/spinbutton/spinbutton.c b/examples/spinbutton/spinbutton.c
index 78000b8270b6bf5b2eaec2370279f9dc548f8284..6b26d09a64ca5888e561e4f50ba9ae6b8c4ef4bc 100644 (file)
--- a/examples/spinbutton/spinbutton.c
+++ b/examples/spinbutton/spinbutton.c
@@ -95,8 +95,6 @@ int main( int   argc,
                                              5.0, 0.0);
   spinner = gtk_spin_button_new (adj, 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
-  gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
-                                  GTK_SHADOW_OUT);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
   
   vbox2 = gtk_vbox_new (FALSE, 0);
@@ -110,8 +108,6 @@ int main( int   argc,
                                              5.0, 0.0);
   spinner = gtk_spin_button_new (adj, 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
-  gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
-                                  GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
   
   vbox2 = gtk_vbox_new (FALSE, 0);
@@ -125,8 +121,6 @@ int main( int   argc,
                                              1.0, 100.0, 0.0);
   spinner = gtk_spin_button_new (adj, 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), FALSE);
-  gtk_spin_button_set_shadow_type (GTK_SPIN_BUTTON (spinner),
-                                  GTK_SHADOW_IN);
   gtk_widget_set_usize (spinner, 55, 0);
   gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
   

diff --git a/examples/statusbar/Makefile b/examples/statusbar/Makefile
index 8177178c25330ff9a7bb1a720a812ddb14a70e16..6ca8eaf1a3865b6c06f9591896dc0c32a96401ce 100644 (file)
--- a/examples/statusbar/Makefile
+++ b/examples/statusbar/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 statusbar: statusbar.c 
-       $(CC) `gtk-config --cflags`  statusbar.c -o statusbar `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  statusbar.c -o statusbar `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o statusbar

diff --git a/examples/table/Makefile b/examples/table/Makefile
index b2a0f03e8fdbc30a0086abfdf1ef9f10b8a0cf36..b6221ef63724e182c3099d19c3d26c7e6583bb0b 100644 (file)
--- a/examples/table/Makefile
+++ b/examples/table/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 table: table.c 
-       $(CC) `gtk-config --cflags`  table.c -o table `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  table.c -o table `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o table

diff --git a/examples/text/Makefile b/examples/text/Makefile
index 1ebb1ff2b40b42fed01b6dc5f376d76fa3fd06d1..627aab31396d08ffbd24e967dc678ff209cf4b48 100644 (file)
--- a/examples/text/Makefile
+++ b/examples/text/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 text: text.c 
-       $(CC) `gtk-config --cflags`  text.c -o text `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  text.c -o text `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o text

diff --git a/examples/tictactoe/Makefile b/examples/tictactoe/Makefile
index 0dab1ea755db321e3eb0a11817d7b4b4aa72c2ae..5fe6eb356571e282076f548fc0b5183fafb2e874 100644 (file)
--- a/examples/tictactoe/Makefile
+++ b/examples/tictactoe/Makefile
@@ -2,13 +2,13 @@
 CC = gcc
 
 ttt_test: tictactoe.o ttt_test.o
-       $(CC) ttt_test.o tictactoe.o -o ttt_test `gtk-config --libs`
+       $(CC) ttt_test.o tictactoe.o -o ttt_test `pkg-config --libs gtk+-2.0`
 
 ttt_test.o: ttt_test.c tictactoe.h
-       $(CC) `gtk-config --cflags` -c ttt_test.c -o ttt_test.o
+       $(CC) `pkg-config --cflags gtk+-2.0` -c ttt_test.c -o ttt_test.o
 
 tictactoe.o: tictactoe.c tictactoe.h
-       $(CC) `gtk-config --cflags` -c tictactoe.c -o tictactoe.o
+       $(CC) `pkg-config --cflags gtk+-2.0` -c tictactoe.c -o tictactoe.o
 
 clean: 
        rm -f *.o ttt_test

diff --git a/examples/tree/Makefile b/examples/tree/Makefile
index d6ad4cd6fae20ffa8d1b9e2997fdb316e652caf6..015f78ece4ad1cff9545d9b4a4ec30e16cdd5a51 100644 (file)
--- a/examples/tree/Makefile
+++ b/examples/tree/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 tree: tree.c 
-       $(CC) `gtk-config --cflags`  tree.c -o tree `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0`  tree.c -o tree `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o tree

diff --git a/examples/wheelbarrow/Makefile b/examples/wheelbarrow/Makefile
index 1bc9696c231d0a772a150af767a1c0a5f065e5f4..b004ca918338d966d2ea2e50d7612e1be9c6ab26 100644 (file)
--- a/examples/wheelbarrow/Makefile
+++ b/examples/wheelbarrow/Makefile
@@ -2,7 +2,7 @@
 CC = gcc
 
 wheelbarrow: wheelbarrow.c 
-       $(CC) `gtk-config --cflags` wheelbarrow.c -o wheelbarrow `gtk-config --libs`
+       $(CC) `pkg-config --cflags gtk+-2.0` wheelbarrow.c -o wheelbarrow `pkg-config --libs gtk+-2.0`
 
 clean: 
        rm -f *.o wheelbarrow