janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 13:03:58 +01:00
Code Activity

$(TOPDIR), make, scripts: Search-and-replace ytools -> jw-build

Browse source 
This project was copied from ytools, with anything not related to providing
build-functionality left out. This commit replaces the occurences of ytools
with jw-build, and removes some but most certainly not all legacy ytools
references.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-07 12:15:48 +00:00
commit 55fa0eaec5
22 changed files with 92 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

12
make/defs.mk
View file

@ -2,8 +2,8 @@
# contact@jannet.de
# $Id$
ifndef YTOOLS_DEF_MK_INCLUDED
YTOOLS_DEF_MK_INCLUDED = true
ifndef JW_BUILD_DEF_MK_INCLUDED
JW_BUILD_DEF_MK_INCLUDED = true
include $(MODDIR)/make/platform.mk
include $(MODDIR)/make/projects.mk
@ -108,7 +108,7 @@ BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2)
CVS_RSH ?= /usr/bin/ssh
# ----- input dirs
YTOOLS_DIR = $(MODDIR)
JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
CVS_ROOT_DIR = $(shell test -d CVS && pwd | $(SED) -e "s%`$(CAT) CVS/Repository`%%; s%/$$%%")
REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
@ -166,7 +166,7 @@ PKG_VENDOR ?= janware GmbH
FULL_NAME ?= $(shell id -nu | xargs getent passwd | cut -d: -f5)
USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_YTOOLS ?= true
USE_JW_BUILD ?= true
USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true
ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
@ -790,9 +790,9 @@ ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS += -l$(LIBNAME)
endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),)
ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifeq ($(TARGET),mingw)
YTOOLS_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
endif
endif