diff --git a/Makefile b/Makefile deleted file mode 100644 index 7b83d17..0000000 --- a/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -BASEFLAGS = -O2 -g2 -Wall -Wextra -Ithird_party/docopt.cpp -CFLAGS = -std=c99 $(BASEFLAGS) -CXXFLAGS = -std=c++17 $(BASEFLAGS) - -LDLIBS = -lpcidriver -lpthread - -ALL = decode-reg -OBJ = decode-reg.o pcie.o decoders.o printer.o acq.o lamp.o util.o third_party/docopt.cpp/docopt.o - -all: $(ALL) - -decode-reg: $(OBJ) - $(CXX) $(BASEFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS) - -clean: - rm -f $(ALL) $(OBJ) diff --git a/meson.build b/meson.build index 880ec7e..363887c 100644 --- a/meson.build +++ b/meson.build @@ -14,6 +14,6 @@ thread_dep = dependency('threads') executable( 'decode-reg', ['decode-reg.cc', 'pcie.c', 'decoders.cc', 'printer.cc', 'acq.cc', 'lamp.cc', 'util.cc'], - dependencies: [pcidevice, thread_dep, docopt], + dependencies: [pcidevice, thread_dep, docopt, sdbfs], install: true, )