diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /gpe-watch | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'gpe-watch')
| -rw-r--r-- | gpe-watch/gpe-watch-0.10/fix_makefile.patch | 47 | ||||
| -rw-r--r-- | gpe-watch/gpe-watch_0.10.bb | 0 |
2 files changed, 0 insertions, 47 deletions
diff --git a/gpe-watch/gpe-watch-0.10/fix_makefile.patch b/gpe-watch/gpe-watch-0.10/fix_makefile.patch deleted file mode 100644 index ebea8d66e9..0000000000 --- a/gpe-watch/gpe-watch-0.10/fix_makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 diff --git a/gpe-watch/gpe-watch_0.10.bb b/gpe-watch/gpe-watch_0.10.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/gpe-watch/gpe-watch_0.10.bb +++ /dev/null |