janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-27 15:33:55 +01:00
Code Activity

defs.mk: Don't link against systemd without SDK

Browse source 
Only link against systemd if /usr/include/systemd/sd-daemon.h exists.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-06-29 15:32:53 +00:00
commit d5b41e91b0
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs.mk
View file

@ -114,7 +114,9 @@ USE_PROJECT_LIB ?= true
USE_YTOOLS ?= true USE_YTOOLS ?= true
USE_EXCEPTIONS_IN_C ?= true USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true REENTRANT ?= true
ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
USE_SYSTEMD ?= true USE_SYSTEMD ?= true
endif
export REENTRANT export REENTRANT

18
make/tex.mk
View file

@ -36,7 +36,7 @@ TEX_TMPL_BASE_DIR ?= $(MODDIR)/texdoc
TEX_TMPL_STYLE ?= de_technical TEX_TMPL_STYLE ?= de_technical
TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE)
IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl)
IMAGEDIR ?= $(CVSTOPDIR)/images WWW_IMAGEDIR ?= $(CVS_PROJ_DIR)/www-janware/tools/html/htdocs/images
FRONTLOGO_PDF ?= logo-janware.pdf FRONTLOGO_PDF ?= logo-janware.pdf
FRONTLOGO_EPS ?= janware-frontpage-top-right.png FRONTLOGO_EPS ?= janware-frontpage-top-right.png
FRONTLOGO_WEB ?= janware-frontpage-top-right.png FRONTLOGO_WEB ?= janware-frontpage-top-right.png
@ -243,9 +243,21 @@ texsrc: $(GENERATED)
%: %.tmpl %: %.tmpl
$(mangle_tmpl) $(mangle_tmpl)
$(FRONTLOGO_PDF): $(IMAGEDIR)/$(patsubst %.pdf,%.svg,$(FRONTLOGO_PDF)) $(FRONTLOGO_PDF): $(WWW_IMAGEDIR)/$(patsubst %.pdf,%.svg,$(FRONTLOGO_PDF))
inkscape -w 30mm --export-pdf=$@ $< inkscape -w 30mm --export-pdf=$@ $<
%.pdf: %.svg
inkscape -w 30mm --export-pdf=$@ $<
$(WWW_IMAGEDIR)/%.svg: %.svg
cp $< $@
$(CVS_IMAGEDIR)/%.svg: %.svg
cp $< $@
$(CVS_IMAGEDIR)/%.png: %.png
cp $< $@
cfgtest.done: cfgtest.done:
test -n "$(OUTPUT)" # OUTPUT test -n "$(OUTPUT)" # OUTPUT
test -n "$(DISTDIR)" # DISTDIR test -n "$(DISTDIR)" # DISTDIR
@ -261,7 +273,7 @@ cfgtest.done:
test -n "$(AUTHORS)" # AUTHORS test -n "$(AUTHORS)" # AUTHORS
test -n "$(TITLE)" # TITLE test -n "$(TITLE)" # TITLE
test -n "$(SUBTITLE)" # SUBTITLE test -n "$(SUBTITLE)" # SUBTITLE
test -d $(IMAGEDIR) # IMAGEDIR test -d $(WWW_IMAGEDIR) # IMAGEDIR
@for IMG in $(IMAGES); do if [ ! -f $$IMG ]; then echo "$$IMG is missing"; exit 1; fi; done @for IMG in $(IMAGES); do if [ ! -f $$IMG ]; then echo "$$IMG is missing"; exit 1; fi; done
test -n "$(VERSION)" # VERSION test -n "$(VERSION)" # VERSION
touch $@ touch $@