diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /gpe-watch/gpe-watch-0.10 | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'gpe-watch/gpe-watch-0.10')
| -rw-r--r-- | gpe-watch/gpe-watch-0.10/fix_makefile.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/gpe-watch/gpe-watch-0.10/fix_makefile.patch b/gpe-watch/gpe-watch-0.10/fix_makefile.patch index e69de29bb2..ebea8d66e9 100644 --- a/gpe-watch/gpe-watch-0.10/fix_makefile.patch +++ b/gpe-watch/gpe-watch-0.10/fix_makefile.patch @@ -0,0 +1,47 @@ +diff -urNd ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile gpe-watch-0.10/Makefile +--- ../gpe-watch-0.10-r0/gpe-watch-0.10/Makefile 2004-08-03 15:43:54.000000000 +0100 ++++ gpe-watch-0.10/Makefile 2004-08-03 16:08:52.000000000 +0100 +@@ -8,26 +8,26 @@ + MEMBERS = gpe-watch + + GTKCFLAGS = `pkg-config --cflags gtk+-2.0` -DGTK_DISABLE_DEPRECATED +-GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext -lXinerama ++GTKLDFLAGS += -L/skiff/local/arm-linux/lib/X11 `pkg-config --libs gtk+-2.0` -lX11 -lXrender -lXext + +-CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall ++PACKAGE_CFLAGS = $(GTKCFLAGS) -DUSE_GPE -D_GNU_SOURCE -Wall + ifeq ($(DEBUG),yes) + CFLAGS += -O2 -g +-LDFLAGS = -g #-lefence ++LDFLAGS += -g #-lefence + else + CFLAGS += -Os -fomit-frame-pointer + endif +-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" ++PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" + + ifeq ($(CVSBUILD),yes) +-CFLAGS += -I../libgpewidget +-LDFLAGS += -L../libgpewidget ++PACKAGE_CFLAGS += -I../libgpewidget ++PACKAGE_LDFLAGS += -L../libgpewidget + BUILD = ../build + else +-CFLAGS += -I/usr/include/gpe ++PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GPECFLAGS) + BUILD = build + endif +-LDFLAGS += -lgpewidget $(GTKLDFLAGS) ++PACKAGE_LDFLAGS += -lgpewidget $(GTKLDFLAGS) + + OBJS = $(patsubst %,%.o,$(MEMBERS)) + SOURCES = $(patsubst %,%.c,$(MEMBERS)) +@@ -35,7 +35,7 @@ + all: $(PACKAGE) + + $(PACKAGE): $(OBJS) $(LIB) +- $(CC) -o $@ $^ $(LDFLAGS) ++ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) + + install-program: all $(PACKAGE).desktop + mkdir -p $(DESTDIR)$(PREFIX)/bin |