--- /dev/null +++ Makefile 2013/06/14 21:32:56 @@ -0,0 +1,15 @@ +# $Header: /home/hiro/projects/raspberrypi/wiringPi/RCS/Makefile,v 1.2 2013/06/14 20:22:57 hiro Exp $ +# +# Dummy Makefile to interface the build script +# + +.PHONY: install uninstall clean send unsend patch patch-install +install uninstall clean send unsend: + ./build $@ + +PATCH = wiringPi.patch +patch: + rcs2patch.sh > $(PATCH) + +patch-install: + install $(PATCH) /var/www/html2/project/linux/ --- wiringPi/build 2013/06/13 22:38:35 1.1 +++ wiringPi/build 2013/06/14 21:23:26 @@ -1,5 +1,27 @@ #!/bin/sh +# $Header: /home/hiro/projects/raspberrypi/wiringPi/RCS/build,v 1.3 2013/06/14 21:23:18 hiro Exp $ +# +# Modified for cross build by Hiro Sugawara +# + +#### Customize items here #### +# Cross compiler +export CC=$RPiCC + +# Target user@host name +export RPi='root@raspberrypi' + +# Local install dir +export INSTALL_DIR=../wiringPi-install +cwd=`pwd` +# Create necessary dir and convert INSTALL_DIR to absolue. +mkdir -p ${INSATALL_DIR}/usr/lib +cd $INSTALL_DIR +INSTALL_DIR=`pwd` +cd $cwd +############################# + check_make_ok() { if [ $? != 0 ]; then echo "" @@ -12,31 +34,59 @@ check_make_ok() { fi } +if [ x$1 = "xsend" ]; then + rsync -av -e "ssh -l root" $INSTALL_DIR/ ${RPi}:/ + files='' + for i in `find $INSTALL_DIR -type f -or -type l`; do + file=`echo $i | sed "s|^$INSTALL_DIR||"` + files="$files $file" + done + ssh $RPi sudo chown root:root $files + ssh $RPi sudo ldconfig + exit +fi + +if [ x$1 = "xunsend" ]; then + files='' + for i in `find $INSTALL_DIR -type f -or -type l`; do + file=`echo $i | sed "s|^$INSTALL_DIR||"` + files="$files $file" + done + ssh $RPi rm -f $files + exit +fi + if [ x$1 = "xclean" ]; then - cd wiringPi + cwd=`pwd` + cd $cwd/wiringPi echo -n "wiringPi: " ; make clean - cd ../devLib + cd $cwd/devLib echo -n "DevLib: " ; make clean - cd ../gpio + cd $cwd/gpio echo -n "gpio: " ; make clean - cd ../examples + cd $cwd/examples echo -n "Examples: " ; make clean - cd Gertboard + cd $cwd/examples/Gertboard echo -n "Gertboard: " ; make clean - cd ../PiFace + cd $cwd/examples/PiFace echo -n "PiFace: " ; make clean - cd ../q2w + cd $cwd/examples/q2w echo -n "Quick2Wire: " ; make clean exit fi if [ x$1 = "xuninstall" ]; then - cd wiringPi - echo -n "wiringPi: " ; sudo make uninstall - cd ../devLib - echo -n "DevLib: " ; sudo make uninstall - cd ../gpio - echo -n "gpio: " ; sudo make uninstall + cwd=`pwd` + cd $cwd/wiringPi + ##echo -n "wiringPi: " ; sudo make uninstall + echo -n "wiringPi: " ; make uninstall + exit + cd $cwd/devLib + ##echo -n "DevLib: " ; sudo make uninstall + echo -n "DevLib: " ; make uninstall + cd $cwd/gpio + ##echo -n "gpio: " ; sudo make uninstall + echo -n "gpio: " ; make uninstall exit fi @@ -47,28 +97,33 @@ fi echo echo "WiringPi Library" - cd wiringPi - sudo make uninstall + cd $cwd/wiringPi + ##sudo make uninstall + make uninstall make check_make_ok - sudo make install + ##sudo make install + make install check_make_ok echo echo "WiringPi Devices Library" - cd ../devLib - sudo make uninstall + cd $cwd/devLib + ##sudo make uninstall + make uninstall make check_make_ok - sudo make install + ##sudo make install + make install check_make_ok echo echo "GPIO Utility" - cd ../gpio + cd $cwd/gpio make check_make_ok - sudo make install + ##sudo make install + make install check_make_ok # echo --- wiringPi/devLib/Makefile 2013/06/12 01:07:12 1.1 +++ wiringPi/devLib/Makefile 2013/06/14 17:14:27 @@ -24,7 +24,7 @@ DYN_VERS_MAJ=2 DYN_VERS_MIN=0 VERSION=$(DYN_VERS_MAJ).$(DYN_VERS_MIN) -DESTDIR=/usr +DESTDIR=$(INSTALL_DIR)/usr PREFIX=/local STATIC=libwiringPiDev.a @@ -32,8 +32,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) #DEBUG = -g -O0 DEBUG = -O2 +ifeq ($(CC),) CC = gcc -INCLUDE = -I. +endif +INCLUDE = -I. -I$(DESTDIR)$(PREFIX)/include CFLAGS = $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC LIBS = @@ -92,8 +94,9 @@ install: $(DYNAMIC) install-headers @echo "[Install Dynamic Lib]" @install -m 0755 -d $(DESTDIR)$(PREFIX)/lib @install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) - @ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so - @ldconfig + @##ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so + @ln -sf ..$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so + @##ldconfig .PHONEY: install-static install-static: $(STATIC) install-headers @@ -112,7 +115,8 @@ uninstall: @rm -f $(DESTDIR)$(PREFIX)/include/lcd128x64.h @rm -f $(DESTDIR)$(PREFIX)/include/lcd.h @rm -f $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.* - @ldconfig + @rm -f $(DESTDIR)/lib/libwiringPiDev.* + @##ldconfig .PHONEY: depend --- wiringPi/examples/Gertboard/Makefile 2013/06/13 22:36:24 1.1 +++ wiringPi/examples/Gertboard/Makefile 2013/06/14 17:15:37 @@ -7,11 +7,13 @@ #DEBUG = -g -O0 DEBUG = -O3 +ifeq ($(CC),) CC = gcc -INCLUDE = -I/usr/local/include +endif +INCLUDE = -I$(INSTALL_DIR)/usr/local/include CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -LDFLAGS = -L/usr/local/lib +LDFLAGS = -L$(INSTALL_DIR)/usr/local/lib LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm # Should not alter anything below this line --- wiringPi/examples/PiFace/Makefile 2013/06/13 22:37:01 1.1 +++ wiringPi/examples/PiFace/Makefile 2013/06/14 17:15:45 @@ -25,11 +25,13 @@ #DEBUG = -g -O0 DEBUG = -O3 +ifeq ($(CC),) CC = gcc -INCLUDE = -I/usr/local/include +endif +INCLUDE = -I$(INSTALL_DIR)/usr/local/include CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -LDFLAGS = -L/usr/local/lib +LDFLAGS = -L$(INSTALL_DIR)/usr/local/lib LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm # Should not alter anything below this line --- wiringPi/examples/Makefile 2013/06/13 22:35:22 1.1 +++ wiringPi/examples/Makefile 2013/06/14 17:14:43 @@ -25,11 +25,13 @@ #DEBUG = -g -O0 DEBUG = -O3 +ifeq ($(CC),) CC = gcc -INCLUDE = -I/usr/local/include +endif +INCLUDE = -I$(INSTALL_DIR)/usr/local/include CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -LDFLAGS = -L/usr/local/lib +LDFLAGS = -L$(INSTALL_DIR)/usr/local/lib LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm # Should not alter anything below this line --- wiringPi/examples/q2w/Makefile 2013/06/13 22:37:41 1.1 +++ wiringPi/examples/q2w/Makefile 2013/06/14 17:16:00 @@ -25,11 +25,13 @@ #DEBUG = -g -O0 DEBUG = -O3 +ifeq ($(CC),) CC = gcc -INCLUDE = -I/usr/local/include +endif +INCLUDE = -I$(INSTALL_DIR)/usr/local/include CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -LDFLAGS = -L/usr/local/lib +LDFLAGS = -L$(INSTALL_DIR)/usr/local/lib LDLIBS = -lwiringPi -lwiringPiDev -lpthread -lm ############################################################################### --- wiringPi/gpio/Makefile 2013/06/12 01:05:23 1.1 +++ wiringPi/gpio/Makefile 2013/06/14 17:15:16 @@ -25,11 +25,14 @@ #DEBUG = -g -O0 DEBUG = -O2 +ifeq ($(CC),) CC = gcc -INCLUDE = -I/usr/local/include +endif +INCLUDE = -I$(INSTALL_DIR)/usr/local/include CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -LDFLAGS = -L/usr/local/lib +LDFLAGS = -L$(INSTALL_DIR)/usr/local/lib +LDFLAGS += -L$(INSTALL_DIR)/usr/lib LIBS = -lwiringPi -lwiringPiDev -lpthread -lm # May not need to alter anything below this line @@ -62,17 +65,18 @@ tags: $(SRC) .PHONEY: install install: @echo "[Install]" - @cp gpio /usr/local/bin - @chown root.root /usr/local/bin/gpio - @chmod 4755 /usr/local/bin/gpio - @mkdir -p /usr/local/man/man1 - @cp gpio.1 /usr/local/man/man1 + @install -d $(INSTALL_DIR)/usr/local/bin + @install gpio $(INSTALL_DIR)/usr/local/bin + @##chown root.root $(INSTALL_DIR)/usr/local/bin/gpio + @chmod 4755 $(INSTALL_DIR)/usr/local/bin/gpio + @mkdir -p $(INSTALL_DIR)/usr/local/man/man1 + @cp gpio.1 $(INSTALL_DIR)/usr/local/man/man1 .PHONEY: uninstall uninstall: @echo "[UnInstall]" - @rm -f /usr/local/bin/gpio - @rm -f /usr/local/man/man1/gpio.1 + @rm -f $(INSTALL_DIR)/usr/local/bin/gpio + @rm -f $(INSTALL_DIR)/usr/local/man/man1/gpio.1 .PHONEY: depend depend: --- wiringPi/wiringPi/Makefile 2013/06/12 01:03:54 1.1 +++ wiringPi/wiringPi/Makefile 2013/06/14 17:17:55 @@ -25,7 +25,7 @@ DYN_VERS_MAJ=2 DYN_VERS_MIN=0 VERSION=$(DYN_VERS_MAJ).$(DYN_VERS_MIN) -DESTDIR=/usr +DESTDIR=$(INSTALL_DIR)/usr PREFIX=/local STATIC=libwiringPi.a @@ -33,7 +33,9 @@ DYNAMIC=libwiringPi.so.$(VERSION) #DEBUG = -g -O0 DEBUG = -O2 +ifeq ($(CC),) CC = gcc +endif INCLUDE = -I. CFLAGS = $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC @@ -114,8 +116,9 @@ install: $(DYNAMIC) install-headers @echo "[Install Dynamic Lib]" @install -m 0755 -d $(DESTDIR)$(PREFIX)/lib @install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) - @ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so - @ldconfig + @##ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so + @ln -sf ..$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so + @##ldconfig .PHONEY: install-static install-static: $(STATIC) install-headers @@ -146,7 +149,8 @@ uninstall: @rm -f $(DESTDIR)$(PREFIX)/include/pcf8574.h @rm -f $(DESTDIR)$(PREFIX)/include/pcf8591.h @rm -f $(DESTDIR)$(PREFIX)/lib/libwiringPi.* - @ldconfig + @rm -f $(DESTDIR)/lib/libwiringPi.* + @##ldconfig .PHONEY: depend