38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
--- xdesktopwaves-1.3/Makefile.org 2004-12-18 06:47:40.000000000 +0100
|
|
+++ xdesktopwaves-1.3/Makefile 2010-02-08 20:05:31.000000000 +0100
|
|
@@ -11,14 +11,13 @@
|
|
|
|
#=========================== C compiler configuration ==========================
|
|
|
|
-CC = gcc
|
|
-CFLAGS = -I/usr/X11R6/include -O2
|
|
+CFLAGS += $(shell pkg-config --cflags x11 xext)
|
|
|
|
#============================= Linker configuration ============================
|
|
|
|
-LINK = gcc
|
|
-LFLAGS = -L/usr/X11R6/lib
|
|
-LIBS = -lm -lX11 -lXext
|
|
+LINK = $(CC)
|
|
+LFLAGS = $(LDFLAGS)
|
|
+LIBS = -lm $(shell pkg-config --libs x11 xext)
|
|
|
|
#============================ Installer configuration ==========================
|
|
|
|
--- xdesktopwaves-1.3/xdwapi/Makefile.org 2004-12-18 06:47:40.000000000 +0100
|
|
+++ xdesktopwaves-1.3/xdwapi/Makefile 2010-02-08 20:08:14.000000000 +0100
|
|
@@ -1,10 +1,9 @@
|
|
# Makefile for the xdesktopwaves API and its demo program
|
|
|
|
-CC = gcc
|
|
-CFLAGS = -I/usr/X11R6/include -O2
|
|
-LINK = gcc
|
|
-LFLAGS = -L/usr/X11R6/lib
|
|
-LIBS = -lm -lX11
|
|
+CFLAGS += $(shell pkg-config --cflags x11 xext)
|
|
+LINK = $(CC)
|
|
+LFLAGS = $(LDFLAGS)
|
|
+LIBS = -lm $(shell pkg-config --libs x11 xext)
|
|
|
|
all: xdwapidemo
|
|
|