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 /libdotdesktop | |
| 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 'libdotdesktop')
| -rw-r--r-- | libdotdesktop/libdotdesktop_0.11.bb | 0 | ||||
| -rw-r--r-- | libdotdesktop/make_build_var.patch | 58 |
2 files changed, 0 insertions, 58 deletions
diff --git a/libdotdesktop/libdotdesktop_0.11.bb b/libdotdesktop/libdotdesktop_0.11.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/libdotdesktop/libdotdesktop_0.11.bb +++ /dev/null diff --git a/libdotdesktop/make_build_var.patch b/libdotdesktop/make_build_var.patch deleted file mode 100644 index dd5d97c768..0000000000 --- a/libdotdesktop/make_build_var.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- libdotdesktop-0.11.orig/Makefile 2004-01-13 09:21:54.000000000 +1100 -+++ libdotdesktop-0.11/Makefile 2004-04-28 15:36:02.000000000 +1000 -@@ -4,7 +4,7 @@ - VERSION = 0.11 - CC=gcc - STRIP=strip --BUILD = ../build -+BUILD = build - - LINGUAS = - -@@ -22,7 +22,8 @@ - endif - CFLAGS += -MD - --CPPFLAGS += -I./gpe `pkg-config --cflags glib-2.0` -+PACKAGE_CFLAGS = `pkg-config --cflags glib-2.0` -+PACKAGE_LDFLAGS = `pkg-config --libs glib-2.0` - - HEADERS = dotdesktop.h - -@@ -36,13 +37,13 @@ - ln -sf $^ $@ - - $(SONAME): $(OBJS) -- $(CC) -nostartfiles -shared -o $@ $^ -Wl,-soname -Wl,$(SONAME) $(LDFLAGS) -+ $(CC) -nostartfiles -shared -o $@ $^ -Wl,-soname -Wl,$(SONAME) $(PACKAGE_LDFLAGS) $(LDFLAGS) - - libdotdesktop.a: $(OBJS) - ar cq $@ $^ - --.c.s:; -- $(CC) $(CFLAGS) -S $< -+.c.o:; -+ $(CC) $(PACKAGE_CFLAGS) $(MY_CFLAGS) $(CFLAGS) -c $< -o $@ - - upstream: clean - ( VERSION=`dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut -d- -f1`; cd ..; cp -a libdotdesktop libdotdesktop-$$VERSION.orig; tar czf libdotdesktop_$$VERSION.orig.tar.gz --exclude=libdotdesktop-$$VERSION.orig/debian --exclude=libdotdekstop-$$VERSION.orig/CVS --exclude=libdotdesktop-$$VERSION.orig/familiar libdotdesktop-$$VERSION.orig ; rm -rf libdotdesktop-$$VERSION.orig ) -@@ -55,18 +56,9 @@ - $(STRIP) $(DESTDIR)$(PREFIX)/lib/$(SONAME) - - install-devel: -- for i in $(HEADERS); do install -m 644 -D $$i $(DESTDIR)$(PREFIX)/include/gpe/$$i; done -+ install -m 644 -D dotdesktop.h $(DESTDIR)$(PREFIX)/include/gpe/dotdesktop.h - ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libdotdesktop.so - --#ipkg: clean --# rm -rf familiar/dist --# mkdir -p familiar/dist/CONTROL --# cp familiar/$(CONTROL) familiar/dist/CONTROL/control --# cp familiar/postinst familiar/dist/CONTROL --# make DESTDIR=`pwd`/familiar/dist PREFIX=/usr DEBUG=no install --# chown -R root.root familiar/dist --# ipkg-build familiar/dist -- - clean: - rm -f $(OBJS) $(SONAME) libdotdesktop.so $(DEPS) - |