aboutsummaryrefslogtreecommitdiffstats
path: root/fb
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-02-23 10:28:22 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-02-23 10:28:22 +0000
commit4fafb6be38daa55fe36a282e67d3defd238a242b (patch)
treecc65c62440b34a85b56b514dea2771ae078f2d48 /fb
parent690703d95de4a770de222732a8fc8a6231d265b1 (diff)
downloadbootsplash-4fafb6be38daa55fe36a282e67d3defd238a242b.tar
bootsplash-4fafb6be38daa55fe36a282e67d3defd238a242b.tar.gz
bootsplash-4fafb6be38daa55fe36a282e67d3defd238a242b.tar.bz2
bootsplash-4fafb6be38daa55fe36a282e67d3defd238a242b.tar.xz
bootsplash-4fafb6be38daa55fe36a282e67d3defd238a242b.zip
factor out gtk+-2.0 cflags, thus also fixing build on lib64 platforms
(modulo fbmenu)
Diffstat (limited to 'fb')
-rw-r--r--fb/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/fb/Makefile b/fb/Makefile
index 9613f53..e5671ec 100644
--- a/fb/Makefile
+++ b/fb/Makefile
@@ -6,6 +6,8 @@ mbindir=$(prefix)/bin
bindir=$(prefix)/usr/bin
libdir=$(prefix)/usr/lib
+GTK_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
+
CFLAGS=-g -O2 -Wall \
-DVERSION='"$(VERSION)"'
@@ -20,10 +22,10 @@ fbresolution: fbresolution.c
$(CC) $(CFLAGS) -o $@ fbresolution.c
xmenu: fbmenu.c
- gcc -I/usr/include/gtk-2.0/ -I/usr/lib/gtk-2.0/include/ -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/freetype2 -I/usr/include/freetype2/freetype2/config -I/usr/include/atk-1.0 -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -O2 -Wall -lgtk-x11-2.0 -o xmenu fbmenu.c;
+ gcc $(GTK_CFLAGS) -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -O2 -Wall -lgtk-x11-2.0 -o xmenu fbmenu.c;
fbmenu: fbmenu.c
- gcc -I/usr/include/gtk-2.0/ -I/usr/lib/gtk-2.0/include/ -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/freetype2 -I/usr/include/freetype2/freetype2/config -I/usr/include/atk-1.0 -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API -O2 -Wall libgtk-linux-fb-2.0.so -o fbmenu fbmenu.c;
+ gcc $(GTK_CFLAGS) -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_CAST_CHECKS -pthread -O2 -Wall libgtk-linux-fb-2.0.so -o fbmenu fbmenu.c;
progress: progress.c
$(CC) $(CFLAGS) $(FSFLAGS) -o $@ progress.c