forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-05-26 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

objects in separate directory

Browse Source
This commit is contained in:
Devaev Maxim
2019-09-17 20:13:18 +03:00
parent fcdb8f5d42
commit 7a699833c4
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,8 +2,8 @@
/pkg/arch/src/ /pkg/arch/src/
/pkg/arch/v*.tar.gz /pkg/arch/v*.tar.gz
/pkg/arch/ustreamer-*.pkg.tar.xz /pkg/arch/ustreamer-*.pkg.tar.xz
/build/
/config.mk /config.mk
/vgcore.* /vgcore.*
/ustreamer /ustreamer
/*.sock /*.sock
*.o

28
Makefile
View File

@@ -11,11 +11,13 @@ LDFLAGS ?=
RPI_VC_HEADERS ?= /opt/vc/include RPI_VC_HEADERS ?= /opt/vc/include
RPI_VC_LIBS ?= /opt/vc/lib RPI_VC_LIBS ?= /opt/vc/lib
BUILD ?= build
# ===== # =====
LIBS = -lm -ljpeg -pthread -levent -levent_pthreads -luuid _LIBS = -lm -ljpeg -pthread -levent -levent_pthreads -luuid
override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE
SOURCES = $(shell ls src/*.c src/http/*.c src/encoders/cpu/*.c src/encoders/hw/*.c) _SRCS = $(shell ls src/*.c src/http/*.c src/encoders/cpu/*.c src/encoders/hw/*.c)
define optbool define optbool
@@ -24,14 +26,14 @@ endef
ifneq ($(call optbool,$(WITH_OMX)),) ifneq ($(call optbool,$(WITH_OMX)),)
LIBS += -lbcm_host -lvcos -lopenmaxil -L$(RPI_VC_LIBS) _LIBS += -lbcm_host -lvcos -lopenmaxil -L$(RPI_VC_LIBS)
override CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS) override CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS)
SOURCES += $(shell ls src/encoders/omx/*.c) _SRCS += $(shell ls src/encoders/omx/*.c)
endif endif
ifneq ($(call optbool,$(WITH_GPIO)),) ifneq ($(call optbool,$(WITH_GPIO)),)
LIBS += -lwiringPi _LIBS += -lwiringPi
override CFLAGS += -DWITH_GPIO override CFLAGS += -DWITH_GPIO
endif endif
@@ -43,7 +45,7 @@ endif
# ===== # =====
all: $(SOURCES) $(PROG) all: $(PROG)
install: $(PROG) install: $(PROG)
@@ -63,19 +65,20 @@ regen:
tools/make-html-h.py src/http/data/index.html src/http/data/index_html.h INDEX tools/make-html-h.py src/http/data/index.html src/http/data/index_html.h INDEX
$(PROG): $(SOURCES:.c=.o) $(PROG): $(_SRCS:%.c=$(BUILD)/%.o)
$(info -- LD $@) $(info -- LD $@)
@ $(CC) $(SOURCES:.c=.o) -o $@ $(LDFLAGS) $(LIBS) @ $(CC) $^ -o $@ $(LDFLAGS) $(_LIBS)
$(info ===== Build complete =====) $(info ===== Build complete =====)
$(info == CC = $(CC)) $(info == CC = $(CC))
$(info == LIBS = $(LIBS)) $(info == LIBS = $(_LIBS))
$(info == CFLAGS = $(CFLAGS)) $(info == CFLAGS = $(CFLAGS))
$(info == LDFLAGS = $(LDFLAGS)) $(info == LDFLAGS = $(LDFLAGS))
.c.o: $(BUILD)/%.o: %.c
$(info -- CC $<) $(info -- CC $<)
@ $(CC) $< -o $@ $(CFLAGS) $(LIBS) @ mkdir -p $(dir $@) || true
@ $(CC) $< -o $@ $(CFLAGS) $(_LIBS)
release: release:
@@ -97,6 +100,5 @@ push:
clean-all: clean clean-all: clean
clean: clean:
find src -name '*.o' -exec rm '{}' \;
rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.xz rm -rf pkg/arch/pkg pkg/arch/src pkg/arch/v*.tar.gz pkg/arch/ustreamer-*.pkg.tar.xz
rm -f vgcore.* *.sock $(PROG) rm -rf $(PROG) $(BUILD) vgcore.* *.sock