Skip to content

Commit 54bdd9d

Browse files
committed
workflow: properly generate version.h
1 parent bc23191 commit 54bdd9d

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

Makefile

+10-8
Original file line numberDiff line numberDiff line change
@@ -66,31 +66,32 @@ TARGET_OBJS = $(filter-out third_party/%, $(filter-out tests/%, $(OBJS)))
6666
all: version
6767
+make $(TARGET)
6868

69+
install: version
70+
+make $(TARGET)
71+
install $(TARGET) $(DESTDIR)/usr/local/bin/
72+
6973
.SUFFIXES:
7074

7175
ifeq (1,$(USE_LIBDATACHANNEL))
7276
camera-streamer: $(LIBDATACHANNEL_PATH)/build/libdatachannel-static.a
7377
endif
7478

79+
camera-streamer: $(filter-out cmd/%, $(TARGET_OBJS)) $(filter cmd/camera-streamer/%, $(TARGET_OBJS))
80+
$(CCACHE) $(CXX) $(CFLAGS) -o $@ $^ $(LDLIBS)
81+
7582
.PHONY: version
7683
version:
7784
echo "#define GIT_VERSION \"$(GIT_VERSION)\"\n#define GIT_REVISION \"$(GIT_REVISION)\"" > version.h.tmp
78-
if $(CXX) $(CFLAGS) -o /dev/null -c tests/libcamera/orientation.cc 2>/dev/null; then \
85+
if $(CCACHE) $(CXX) $(CFLAGS) -o tests/libcamera/orientation.o -c tests/libcamera/orientation.cc 2>/dev/null; then \
7986
echo "#define LIBCAMERA_USES_ORIENTATION" >> version.h.tmp; \
8087
else \
8188
echo "#define LIBCAMERA_USES_TRANSFORM" >> version.h.tmp; \
8289
fi
8390
diff -u version.h version.h.tmp || mv version.h.tmp version.h
8491
-rm -f version.h.tmp
8592

86-
%: cmd/% $(TARGET_OBJS)
87-
$(CCACHE) $(CXX) $(CFLAGS) -o $@ $(filter-out cmd/%, $^) $(filter $</%, $^) $(LDLIBS)
88-
89-
install: $(TARGET)
90-
install $(TARGET) $(DESTDIR)/usr/local/bin/
91-
9293
clean:
93-
rm -f .depend $(OBJS) $(OBJS:.o=.d) $(HTML_SRC) $(TARGET)
94+
rm -f .depend $(OBJS) $(OBJS:.o=.d) $(HTML_SRC) $(TARGET) version.h
9495

9596
headers:
9697
find -name '*.h' | xargs -n1 $(CCACHE) $(CC) $(CFLAGS) -std=gnu17 -Wno-error -c -o /dev/null
@@ -104,6 +105,7 @@ headers:
104105
%.o: %.cc
105106
$(CCACHE) $(CXX) -std=c++17 -MMD $(CFLAGS) -c -o $@ $<
106107

108+
.PRECIOUS: html/%.c
107109
html/%.c: html/%
108110
xxd -i $< > $@.tmp
109111
mv $@.tmp $@

0 commit comments

Comments
 (0)