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)

46 files changed, 80 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index d683f6d147..5c05a90f39 100644
--- 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 d683f6d147..5c05a90f39 100644
--- 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 d683f6d147..5c05a90f39 100644
--- 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 d683f6d147..5c05a90f39 100644
--- 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 d683f6d147..5c05a90f39 100644
--- 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 d683f6d147..5c05a90f39 100644
--- 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 d683f6d147..5c05a90f39 100644
--- 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 1430c18141..34904d491b 100644
--- 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 0fed8f559a..1e7f3f5688 100644
--- 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 c6a3b9057b..6865097f54 100644
--- 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 4457ff3fc6..d28bd8d9a4 100644
--- 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 1c918e5ba5..a8474ae2d2 100644
--- 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 8929b48509..e260fa07dc 100644
--- 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 c4cecd65c8..cdb294811c 100644
--- 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 9958842ca3..ef5b67ef79 100644
--- 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 5a89217093..3eb24d5ce4 100644
--- 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 92968a1ad6..fe13786831 100644
--- 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 c7fc2474eb..4fe88024bd 100644
--- 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 0afdbf2aa1..b8e389ab7d 100644
--- 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 aef3850e0a..1c388104e2 100644
--- 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 fc25f04f61..1a60bc6e4d 100644
--- 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 db11296b93..d1433bcb95 100644
--- 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 a5b299845e..3cf6d95736 100644
--- 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 366d480302..33e5765b85 100644
--- 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 4b94bb99b9..8c4489ce40 100644
--- 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 b831d3380e..fcfda957f8 100644
--- 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 503cf75a63..b61a8fc8d5 100644
--- 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 f2cb96052e..152f28938c 100644
--- 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 4f5f7f06a2..dc894a2898 100644
--- 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 9d99ca271f..7e421f7cb5 100644
--- 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 da4e4c4ae7..4190416192 100644
--- 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 a3417bd2cc..c62cfad4cb 100644
--- 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 97ff145589..f0e59666ba 100644
--- 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 6c93491b04..d4eb71b40b 100644
--- 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 4a60e7fbba..4ded4c9928 100644
--- 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 008575c04b..5d38b2a0fc 100644
--- 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 0dbc532840..ae74e82830 100644
--- 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 c53cec3b62..fad63ff099 100644
--- 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 255189a0dc..8963922d4a 100644
--- 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 78000b8270..6b26d09a64 100644
--- 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 8177178c25..6ca8eaf1a3 100644
--- 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 b2a0f03e8f..b6221ef637 100644
--- 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 1ebb1ff2b4..627aab3139 100644
--- 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 0dab1ea755..5fe6eb3565 100644
--- 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 d6ad4cd6fa..015f78ece4 100644
--- 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 1bc9696c23..b004ca9183 100644
--- 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