--- Makefile.linux.orig 2015-03-21 18:09:52.618279456 -0700 +++ Makefile.linux 2015-03-21 18:09:08.656812573 -0700 @@ -82,13 +82,13 @@ CFLAGS := -O3 -pthread -Iutm -arch := $(shell echo | gcc -E -dM - | grep __i386__) +arch := $(shell echo | gcc -E -dM - | grep __SSE2__) ifneq ($(arch),) # You might see improvement with -march fine tuned to your hardware. # Probably should keep pentium3 if you will be redistributing binaries # to other people. -CFLAGS += -march=pentium3 +CFLAGS += -march=native -pthread -Iutm endif # -Ofast is actually similar to -O3 and -ffast-math which has @@ -160,7 +160,7 @@ # A step in the right direction but not sufficient to use /usr instead. -INSTALLDIR=/usr/local +INSTALLDIR=/usr # direwolf.desktop was previously handcrafted for the Raspberry Pi. @@ -196,22 +196,22 @@ install : direwolf decode_aprs text2tt tt2text ll2utm utm2ll aclients log2gpx gen_packets \ tocalls.txt symbols-new.txt symbolsX.txt dw-icon.png direwolf.desktop - install direwolf $(INSTALLDIR)/bin - install decode_aprs $(INSTALLDIR)/bin - install text2tt $(INSTALLDIR)/bin - install tt2text $(INSTALLDIR)/bin - install ll2utm $(INSTALLDIR)/bin - install utm2ll $(INSTALLDIR)/bin - install aclients $(INSTALLDIR)/bin - install log2gpx $(INSTALLDIR)/bin - install gen_packets $(INSTALLDIR)/bin - install atest $(INSTALLDIR)/bin - install ttcalc $(INSTALLDIR)/bin - install -D --mode=644 tocalls.txt /usr/share/direwolf/tocalls.txt - install -D --mode=644 symbols-new.txt /usr/share/direwolf/symbols-new.txt - install -D --mode=644 symbolsX.txt /usr/share/direwolf/symbolsX.txt - install -D --mode=644 dw-icon.png /usr/share/direwolf/dw-icon.png - install -D --mode=644 direwolf.desktop /usr/share/applications/direwolf.desktop + install -D --mode=755 direwolf $(INSTALLDIR)/bin/direwolf + install -D --mode=755 decode_aprs $(INSTALLDIR)/bin/decode_aprs + install -D --mode=755 text2tt $(INSTALLDIR)/bin/text2tt + install -D --mode=755 tt2text $(INSTALLDIR)/bin/tt2text + install -D --mode=755 ll2utm $(INSTALLDIR)/bin/ll2utm + install -D --mode=755 utm2ll $(INSTALLDIR)/bin/utm2ll + install -D --mode=755 aclients $(INSTALLDIR)/bin/aclients + install -D --mode=755 log2gpx $(INSTALLDIR)/bin/log2gpx + install -D --mode=755 gen_packets $(INSTALLDIR)/bin/gen_packets + install -D --mode=755 atest $(INSTALLDIR)/bin/atest + install -D --mode=755 ttcalc $(INSTALLDIR)/bin/ttcalc + install -D --mode=644 tocalls.txt $(INSTALLDIR)/share/direwolf/tocalls.txt + install -D --mode=644 symbols-new.txt $(INSTALLDIR)/share/direwolf/symbols-new.txt + install -D --mode=644 symbolsX.txt $(INSTALLDIR)/share/direwolf/symbolsX.txt + install -D --mode=644 dw-icon.png $(INSTALLDIR)/share/pixmaps/direwolf/dw-icon.png + install -D --mode=644 direwolf.desktop $(INSTALLDIR)/share/applications/direwolf.desktop install -D --mode=644 CHANGES.txt $(INSTALLDIR)/share/doc/direwolf/CHANGES.txt install -D --mode=644 LICENSE-dire-wolf.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt install -D --mode=644 LICENSE-other.txt $(INSTALLDIR)/share/doc/direwolf/LICENSE-other.txt @@ -221,16 +221,16 @@ install -D --mode=644 APRStt-Implementation-Notes.pdf $(INSTALLDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf install -D --mode=644 A-Better-APRS-Packet-Demodulator.pdf $(INSTALLDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator.pdf install -D --mode=644 Quick-Start-Guide-Windows.pdf $(INSTALLDIR)/share/doc/direwolf/Quick-Start-Guide-Windows.pdf - install -D --mode=644 man1/aclients.1 $(INSTALLDIR)/man/man1/aclients.1 - install -D --mode=644 man1/atest.1 $(INSTALLDIR)/man/man1/atest.1 - install -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/man/man1/decode_aprs.1 - install -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/man/man1/direwolf.1 - install -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/man/man1/gen_packets.1 - install -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/man/man1/ll2utm.1 - install -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/man/man1/log2gpx.1 - install -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/man/man1/text2tt.1 - install -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/man/man1/tt2text.1 - install -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/man/man1/utm2ll.1 + install -D --mode=644 man1/aclients.1 $(INSTALLDIR)/share/man/man1/aclients.1 + install -D --mode=644 man1/atest.1 $(INSTALLDIR)/share/man/man1/atest.1 + install -D --mode=644 man1/decode_aprs.1 $(INSTALLDIR)/share/man/man1/decode_aprs.1 + install -D --mode=644 man1/direwolf.1 $(INSTALLDIR)/share/man/man1/direwolf.1 + install -D --mode=644 man1/gen_packets.1 $(INSTALLDIR)/share/man/man1/gen_packets.1 + install -D --mode=644 man1/ll2utm.1 $(INSTALLDIR)/share/man/man1/ll2utm.1 + install -D --mode=644 man1/log2gpx.1 $(INSTALLDIR)/share/man/man1/log2gpx.1 + install -D --mode=644 man1/text2tt.1 $(INSTALLDIR)/share/man/man1/text2tt.1 + install -D --mode=644 man1/tt2text.1 $(INSTALLDIR)/share/man/man1/tt2text.1 + install -D --mode=644 man1/utm2ll.1 $(INSTALLDIR)/share/man/man1/utm2ll.1 @echo " " @echo "If this is your first install, not an upgrade, type this" @echo "to put a copy of the sample configuration file in your home directory:" @@ -255,10 +255,10 @@ install-rpi : dw-start.sh cp dw-start.sh ~ - ln -f -s /usr/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop + ln -f -s $(INSTALLDIR)/share/applications/direwolf.desktop ~/Desktop/direwolf.desktop install-conf : direwolf.conf - cp direwolf.conf ~ + install -D --mode=644 direwolf.conf $(INSTALLDIR)/../etc/ax25/direwolf.conf # Separate application to decode raw data.