summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorJuergen Beisert <j.beisert@pengutronix.de>2007-01-05 13:38:40 +0000
committerJuergen Beisert <j.beisert@pengutronix.de>2007-01-05 13:38:40 +0000
commite5201bdfed55667611e3164099849cff20683c8d (patch)
tree9210a453c06fcdea29be7c36652515baab2be6ce /patches
parent2204c179f73eb274d194098338ec3e6e5b24c41f (diff)
downloadptxdist-e5201bdfed55667611e3164099849cff20683c8d.tar.gz
ptxdist-e5201bdfed55667611e3164099849cff20683c8d.tar.xz
* hpanel: Change package's makefile for easier
cross compiling - uses make's built in rules - does not strip the executable until installing - uses pkg-config instead of fixed pathes to libraries and header files git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6735 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'patches')
-rw-r--r--patches/hpanel-0.3.2/generic/cross.patch37
-rw-r--r--patches/hpanel-0.3.2/generic/series1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches/hpanel-0.3.2/generic/cross.patch b/patches/hpanel-0.3.2/generic/cross.patch
new file mode 100644
index 000000000..6ffbc7b18
--- /dev/null
+++ b/patches/hpanel-0.3.2/generic/cross.patch
@@ -0,0 +1,37 @@
+Subject: Patches the Makefile to be able to cross compile
+From: j.beisert@pengutronix.de
+
+The original makefile assumes fixed pathes to libraries and
+include files. This patch replace them with calls to pkg_config.
+It keeps the debug info in the executable until installing
+and uses make's built in rules.
+
+Signed-off-by:
+ j.beisert@pengutronix.de
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,13 +1,14 @@
+-CC=cc
+-CFLAGS= -O2 -I/usr/X11R6/include -DHAVE_XPM -DXFT -DCLOCK
+-LDFLAGS= -L/usr/X11R6/lib -lX11 -lXpm -lXft
++.PHONY: install clean
++
++CFLAGS=-O2 -g `pkg-config --cflags xft` `pkg-config --cflags xpm` -DCLOCK
++LDFLAGS=`pkg-config --libs xft` `pkg-config --libs xpm`
+ PROGNAME=hpanel
+
+-$(PROGNAME): Makefile hpanel.c hpanel.h icon.xpm
+- $(CC) $(CFLAGS) $(LDFLAGS) hpanel.c -o $(PROGNAME)
+- @ls -l $(PROGNAME)
+- strip $(PROGNAME)
+- @ls -l $(PROGNAME)
++$(PROGNAME): hpanel.c
+
+ install:
+- install $(PROGNAME) /usr/local/bin
++ install --strip $(PROGNAME) /usr/local/bin
++
++clean:
++ @rm -f $(PROGNAME)
++
diff --git a/patches/hpanel-0.3.2/generic/series b/patches/hpanel-0.3.2/generic/series
new file mode 100644
index 000000000..def274a02
--- /dev/null
+++ b/patches/hpanel-0.3.2/generic/series
@@ -0,0 +1 @@
+cross.patch