diff options
author | Erik Hovland <erik@hovland.org> | 2006-08-30 18:42:42 +0000 |
---|---|---|
committer | Erik Hovland <erik@hovland.org> | 2006-08-30 18:42:42 +0000 |
commit | 4d36c0d6c6c4e6ed9f148d70588fdb16798e9b9c (patch) | |
tree | e1e2d433887f193ea6be861ece68309e7d667619 /packages/horizon/files/makefile.patch | |
parent | ff49b42aedb3c09f71cb35456140b9afcf6b40b8 (diff) | |
parent | 71bd0cd9cf4addbc38028705674fb56c2a644071 (diff) |
merge of 'd0e2c30b999cbef32c26717651606b8411ad02d6'
and 'ffac2606c1f6116f54c1871ff55c69f027252547'
Diffstat (limited to 'packages/horizon/files/makefile.patch')
-rw-r--r-- | packages/horizon/files/makefile.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/packages/horizon/files/makefile.patch b/packages/horizon/files/makefile.patch new file mode 100644 index 0000000000..33f341ef08 --- /dev/null +++ b/packages/horizon/files/makefile.patch @@ -0,0 +1,34 @@ +--- /tmp/Makefile 2006-08-30 12:51:56.000000000 +0200 ++++ horizon/src/Makefile 2006-08-30 12:53:03.025780000 +0200 +@@ -2,12 +2,11 @@ + + all: .depend $(BINARY) + +-CFLAGS = -g -O2 -Wall -Werror \ +- -I/usr/X11R6/include \ ++HCFLAGS = -g -O2 -Wall -Werror \ + `sdl-config --cflags` \ + `pkg-config --cflags glib-2.0 gobject-2.0 libpng` \ + -I. +-LDFLAGS = -L/usr/X11R6/lib -lX11 \ ++HLDFLAGS = -lX11 \ + `sdl-config --libs` \ + `pkg-config --libs glib-2.0 gobject-2.0 libpng` \ + -ljpeg +@@ -16,7 +15,7 @@ + OBJS = $(CFILES:.c=.o) + + $(BINARY): $(OBJS) +- $(CC) *.o */*.o -o $@ $(LDFLAGS) ++ $(CC) *.o */*.o -o $@ $(LDFLAGS) $(HLDFLAGS) + + clean: + rm -f $(OBJS) $(BINARY) *.o *~ */*~ */*/*~ .depend +@@ -35,6 +34,6 @@ + ./$(BINARY) /tmp/horizon + + .depend: *.[ch] */*.[ch] +- $(CC) -M $(CFLAGS) */*.c *.c > .depend ++ $(CC) -M $(CFLAGS) $(HCFLAGS) */*.c *.c > .depend + + include .depend |