[aadk-commits] qwell: branch uClinux/upstreamsync r634 - in /uClinux/branches/upstreamsync/u...
SVN commits to the AADK repository
aadk-commits at lists.digium.com
Thu Oct 18 13:25:29 CDT 2007
Author: qwell
Date: Thu Oct 18 13:25:28 2007
New Revision: 634
URL: http://svn.digium.com/view/aadk?view=rev&rev=634
Log:
Move ncurses into subdir like upstream has it. This will hopefully make the merge a bit easier.
Added:
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/ANNOUNCE
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ANNOUNCE
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/AUTHORS
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/AUTHORS
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/Ada95/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Ada95/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/INSTALL
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/INSTALL
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/MANIFEST
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/MANIFEST
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/Makefile.in
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile.in
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/Makefile.os2
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile.os2
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/NEWS
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/NEWS
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/README
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/README
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/README.emx
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/README.emx
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/TO-DO
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/TO-DO
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/aclocal.m4
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/aclocal.m4
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/announce.html.in
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/announce.html.in
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/c++/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/c++/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/config.guess
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/config.guess
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/config.sub
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/config.sub
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/configure
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/configure
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/configure.in
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/configure.in
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/convert_configure.pl
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/convert_configure.pl
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/dist.mk
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/dist.mk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/doc/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/doc/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/form/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/form/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/include/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/include/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/install-sh
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/install-sh
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/man/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/man/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/menu/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/menu/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/misc/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/misc/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/mk-0th.awk
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mk-0th.awk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/mk-1st.awk
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mk-1st.awk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/mk-2nd.awk
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mk-2nd.awk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/mkinstalldirs
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mkinstalldirs
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/ncurses/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/panel/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/panel/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/progs/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/progs/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/tack/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/tack/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/tar-copy.sh
- copied unchanged from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/tar-copy.sh
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses-5.6/test/
- copied from r633, uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/test/
Removed:
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ANNOUNCE
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/AUTHORS
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Ada95/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/INSTALL
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/MANIFEST
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile.in
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile.os2
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/NEWS
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/README
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/README.emx
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/TO-DO
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/aclocal.m4
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/announce.html.in
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/c++/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/config.guess
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/config.sub
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/configure
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/configure.in
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/convert_configure.pl
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/dist.mk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/doc/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/form/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/include/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/install-sh
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/man/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/menu/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/misc/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mk-0th.awk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mk-1st.awk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mk-2nd.awk
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/mkinstalldirs
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/ncurses/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/panel/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/progs/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/tack/
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/tar-copy.sh
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/test/
Modified:
uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile
Modified: uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile?view=diff&rev=634&r1=633&r2=634
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/lib/ncurses/Makefile Thu Oct 18 13:25:28 2007
@@ -1,3 +1,5 @@
+VER = ncurses-5.6
+
NCURSES_TERMS = linux,vt100,vt220,xterm
NCURSES_DEMOS = dots firework gdc hanoi newdemo railroad rain tclock worm xmas
@@ -7,19 +9,19 @@
NCURSES_SHARED = --without-shared
endif
-all: build/Makefile
- $(MAKE) -C build install DESTDIR=$(STAGEDIR)
+all: build-$(VER)/Makefile
+ $(MAKE) -C build-$(VER) install DESTDIR=$(STAGEDIR)
ifeq ($(CONFIG_USER_NCURSES_TESTS),y)
- $(MAKE) -C build/test
+ $(MAKE) -C build-$(VER)/test
endif
-build/Makefile:
- find . -type f -print0 | xargs -0 touch -r configure
+build-$(VER)/Makefile:
+ find $(VER) -type f -print0 | xargs -0 touch -r $(VER)/configure
set -e ; \
- rm -rf build ; \
- mkdir build ; \
- cd build ; \
- ../configure \
+ rm -rf build-$(VER) ; \
+ mkdir build-$(VER) ; \
+ cd build-$(VER) ; \
+ ../$(VER)/configure \
$(CONFIGURE_OPTS) \
$(NCURSES_SHARED) \
--disable-termcap \
@@ -32,16 +34,16 @@
--enable-const
clean:
- rm -rf build
+ rm -rf build*
romfs:
$(ROMFSINST) -e CONFIG_FMT_USE_FDPIC_ELF $(STAGEDIR)/usr/lib/libncurses.so.5 /lib/
mkdir -p $(ROMFSDIR)/usr/share/terminfo
- tic -x -s -e $(NCURSES_TERMS) -o $(ROMFSDIR)/usr/share/terminfo/ misc/terminfo.src
+ tic -x -s -e $(NCURSES_TERMS) -o $(ROMFSDIR)/usr/share/terminfo/ $(VER)/misc/terminfo.src
set -e ; \
for x in $(NCURSES_DEMOS) ; do \
- $(ROMFSINST) -e CONFIG_USER_NCURSES_TESTS build/test/$$x /bin/ncurses-demo-$$x ; \
+ $(ROMFSINST) -e CONFIG_USER_NCURSES_TESTS build-$(VER)/test/$$x /bin/ncurses-demo-$$x ; \
done
.PHONY: all clean romfs
More information about the aadk-commits
mailing list