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 /rosetta | |
| 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 'rosetta')
| -rw-r--r-- | rosetta/rosetta-makefile.patch | 91 | ||||
| -rw-r--r-- | rosetta/rosetta_cvs.bb | 0 |
2 files changed, 0 insertions, 91 deletions
diff --git a/rosetta/rosetta-makefile.patch b/rosetta/rosetta-makefile.patch deleted file mode 100644 index 73efd99535..0000000000 --- a/rosetta/rosetta-makefile.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -u rosetta.orig/Makefile rosetta/Makefile ---- rosetta.orig/Makefile 2003-09-28 00:37:58.000000000 +1000 -+++ rosetta/Makefile 2004-04-29 13:16:23.000000000 +1000 -@@ -20,45 +20,30 @@ - PACKAGE = rosetta - GTK_PACKAGE = rosettalearn - CVSBUILD = yes -- - BUILD = build -- - VERSION = 0.01 - - DESTDIR = --PREFIX = /usr/local -+PREFIX = /usr - OPTIONS = -DNEW_NORMALIZE_CODE -DNEW_MATCH_CODE -- --ifeq ($(CROSSCOMPILE),yes) -- --CC = arm-linux-gcc --STRIP = arm-linux-strip -- --PKG_CONFIG_PATH=/skiff/local/arm-linux/lib/pkgconfig/ -- --LDFLAGS += -L/skiff/local/arm-linux/lib --LDFLAGS += -L/skiff/local/arm-linux/lib/X11 --LDFLAGS += -lX11 -lXtst -lXext -lm -- --else -- --CC = gcc --STRIP = strip -- --LDFLAGS += -L/usr/X11R6/lib -lX11 -lXtst -lm -- --endif -- - CONTROL = control - - CFLAGS += -Os -Wall - CFLAGS += -MD $(OPTIONS) -g --CFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DGTK_PACKAGE=\"$(GTK_PACKAGE)\" -DPREFIX=\"$(PREFIX)\" --CFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" --CFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\" --CFLAGS += -I$(GPE_DIR)/libgpewidget --CFLAGS += -DENABLE_NLS --CFLAGS += $(GPECFLAGS) -+ -+PACKAGE_CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" $(OPTIONS) -+PACKAGE_CPPFLAGS += -DGTK_PACKAGE=\"$(GTK_PACKAGE)\" -+PACKAGE_CPPFLAGS += -DPREFIX=\"$(PREFIX)\" -+PACKAGE_CPPFLAGS += -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" -+PACKAGE_CPPFLAGS += -DPACKAGE_DATA_DIR=\"$(PREFIX)/share/\" -+PACKAGE_CPPFLAGS += -DENABLE_NLS -+ -+PACKAGE_CFLAGS += `pkg-config --cflags gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau` -+PACKAGE_LDFLAGS += `pkg-config --libs gtk+-2.0 libgpewidget x11 xrandr xrender xft xtst xext xau` -+PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib -+PACKAGE_LDFLAGS += -L/skiff/local/arm-linux/lib/X11 -+PACKAGE_LDFLAGS += -lm -+ - #CFLAGS += -DDEBUG - - .SUFFIXES: .d .c -@@ -77,11 +62,15 @@ - all: $(PACKAGE) $(GTK_PACKAGE) - - $(PACKAGE): $(OBJS) -- $(CC) -o $@ $^ $(LDFLAGS) -+ $(CC) -o $@ $^ $(PACKAGE_LDFLAGS) $(LDFLAGS) - - $(GTK_PACKAGE): $(GTK_OBJS) -- $(CC) -o $@ $^ $(LDFLAGS) $(GPELIBS) -lXrender -lXinerama -+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) $(GPELIBS) -+ -+.c.o:; -+ $(CC) $(PACKAGE_CPPFLAGS) $(PACKAGE_CFLAGS) -c $< -o $@ - -+install: install-program - install-program: all - install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) - install -D $(GTK_PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(GTK_PACKAGE) -@@ -92,7 +81,7 @@ - mkdir -p $(DESTDIR)/etc - install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/$(PACKAGE).png - install -m 644 penwrite24.png $(DESTDIR)$(PREFIX)/share/pixmaps/penwrite24.png -- install -m 644 $(PACKAGE).pc $(DESTDIR)$(PREFIX)/share/$(PACKAGE) -+# install -m 644 $(PACKAGE).pc $(DESTDIR)$(PREFIX)/share/$(PACKAGE) - install -m 666 $(PACKAGE).db $(DESTDIR)$(PREFIX)/share/$(PACKAGE) - install -m 644 $(PACKAGE).conf $(DESTDIR)/etc - mkdir -p $(DESTDIR)$(PREFIX)/share/applications diff --git a/rosetta/rosetta_cvs.bb b/rosetta/rosetta_cvs.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/rosetta/rosetta_cvs.bb +++ /dev/null |