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 /came | |
| 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 'came')
| -rw-r--r-- | came/came-1.7/compile.patch | 41 | ||||
| -rw-r--r-- | came/came-1.7/make.patch | 46 | ||||
| -rw-r--r-- | came/came_1.7.bb | 0 |
3 files changed, 0 insertions, 87 deletions
diff --git a/came/came-1.7/compile.patch b/came/came-1.7/compile.patch deleted file mode 100644 index af2ff2e6ac..0000000000 --- a/came/came-1.7/compile.patch +++ /dev/null @@ -1,41 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- camE-1.7/webcam.c~compile -+++ camE-1.7/webcam.c -@@ -39,6 +39,13 @@ - - #define VERSION "1.7" - -+#ifndef TRUE -+# define TRUE 1 -+#endif -+#ifndef FALSE -+# define FALSE 0 -+#endif -+ - void log(char *fmt, - ...); - ---- camE-1.7/Makefile~compile -+++ camE-1.7/Makefile -@@ -5,6 +5,7 @@ - exec_prefix=${prefix} - bindir=${exec_prefix}/bin - mandir=${prefix}/man -+docdir=${prefix}/doc/camE-1.7 - - CC=gcc - CFLAGS=-O2 -g -Wall -@@ -34,6 +35,9 @@ - install: all - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) camE $(DESTDIR)$(bindir) -+ $(INSTALL_DIR) $(DESTDIR)$(docdir) -+ $(INSTALL_DATA) camE_text.style camE_title.style \ -+ example.camErc.ssh example.camErc $(DESTDIR)$(docdir) - - clean: - -rm -f $(OBJS) *.moc *~ core* *.bak TAGS camE diff --git a/came/came-1.7/make.patch b/came/came-1.7/make.patch deleted file mode 100644 index 1dd9da1cfd..0000000000 --- a/came/came-1.7/make.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- camE-1.7/Makefile~make -+++ camE-1.7/Makefile -@@ -1,13 +1,16 @@ - srcdir=. - --ROOT= -+DESTDIR= - prefix=/usr/local - exec_prefix=${prefix} --bindir=$(ROOT)${exec_prefix}/bin --mandir=$(ROOT)${prefix}/man -+bindir=${exec_prefix}/bin -+mandir=${prefix}/man - - CC=gcc --CFLAGS=-O3 -g -Wall -I$(srcdir)/.. -I.. -D_GNU_SOURCE `giblib-config --cflags` -+CFLAGS=-O2 -g -Wall -+C_CFLAGS=-I$(srcdir) -D_GNU_SOURCE `giblib-config --cflags` -+LIBS=`giblib-config --libs` -lcurl -+LDFLAGS= - - INSTALL=/usr/bin/install -c - INSTALL_PROGRAM=${INSTALL} -@@ -23,11 +26,14 @@ - all build: $(PROGS) - - camE: $(OBJS) -- $(CC) $(CFLAGS) -o $@ $(OBJS) `giblib-config --libs` -lcurl -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -+ -+%.o: %.c -+ $(CC) $(C_CFLAGS) $(CFLAGS) $< -c -o $@ - - install: all -- $(INSTALL_DIR) $(bindir) -- $(INSTALL_PROGRAM) camE $(bindir) -+ $(INSTALL_DIR) $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) camE $(DESTDIR)$(bindir) - - clean: - -rm -f $(OBJS) *.moc *~ core* *.bak TAGS camE diff --git a/came/came_1.7.bb b/came/came_1.7.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/came/came_1.7.bb +++ /dev/null |