Skip to content

Commit 54f8743

Browse files
committed
last vestiges of built-in fmt removed
1 parent 440987d commit 54f8743

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

Makefile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ else ifneq (,$(wildcard ubxsec.o))
2121
EXTRADEP = ubxsec.o
2222
endif
2323

24-
FMT=ext/fmt-9.1.0
25-
2624
CHEAT_ARG := $(shell ./update-git-hash-if-necessary)
2725

2826
PROGRAMS = navparse ubxtool navnexus navcat navrecv navdump testrunner navdisplay tlecatch reporter sp3feed \
@@ -47,7 +45,7 @@ SIMPLESOCKETS=ext/powerblog/ext/simplesocket/swrappers.o ext/powerblog/ext/simpl
4745

4846
clean:
4947
rm -f *~ *.o *.d ext/*/*.o ext/*/*.d $(PROGRAMS) navmon.pb.h navmon.pb.cc $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) $(H2OPP) $(SIMPLESOCKETS)
50-
rm -f ${FMT}/src/format.[do] ext/sgp4/libsgp4/*.d ext/powerblog/ext/simplesocket/*.d
48+
rm -f ext/sgp4/libsgp4/*.d ext/powerblog/ext/simplesocket/*.d
5149

5250
help2man:
5351
$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/share/man/man1
@@ -75,8 +73,8 @@ download-raspbian-package:
7573
echo "deb https://ota.bike/raspbian/ buster main" > /etc/apt/sources.list.d/galmon.list
7674
apt-get update && apt-get install -y galmon
7775

78-
decrypt: decrypt.o bits.o ${FMT}/src/format.o
79-
$(CXX) -std=gnu++17 $^ -o $@
76+
decrypt: decrypt.o bits.o
77+
$(CXX) -std=gnu++17 $^ -o $@ -lfmt
8078

8179
navparse: navparse.o $(H2OPP) $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o navmon.o coverage.o osen.o trkmeas.o influxpush.o ${EXTRADEP} githash.o sbas.o rtcm.o galileo.o
8280
$(CXX) -std=gnu++17 $^ -o $@ -pthread -L/usr/local/lib -L/usr/local/opt/openssl/lib/ -lh2o-evloop -lssl -lcrypto -lz -lcurl -lprotobuf $(WSLAY) -lfmt
@@ -97,7 +95,7 @@ galmonmon: galmonmon.o $(SIMPLESOCKETS) minicurl.o ubx.o bits.o navmon.pb.o gps
9795

9896

9997
# rs.o fixhunter.o
100-
navdump: navdump.o ${FMT}/src/os.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o navmon.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o sp3.o osen.o trkmeas.o githash.o rinex.o sbas.o rtcm.o galileo.o ${EXTRADEP}
98+
navdump: navdump.o bits.o navmon.pb.o gps.o ephemeris.o beidou.o glonass.o navmon.o $(patsubst %.cc,%.o,$(wildcard ext/sgp4/libsgp4/*.cc)) tle.o sp3.o osen.o trkmeas.o githash.o rinex.o sbas.o rtcm.o galileo.o ${EXTRADEP}
10199
$(CXX) -std=gnu++17 $^ -o $@ -L/usr/local/lib -pthread -lprotobuf -lz -lfmt
102100
# -lfec
103101

0 commit comments

Comments
 (0)