janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

Everywhere: Rename ytools.mk to proj.mk

Browse source 
Replace ytools.mk by proj.mk for consistency reasons:
$(TOPDIR)/make/proj.mk should be the project-wide but project-private
makefile for projects.
This commit is contained in:
Jan Lindemann 2006-07-31 14:12:38 +00:00 • committed by Jan Lindemann
commit 4fd6a6d677
9 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -26,9 +26,9 @@ SUBDIRS = inst/pre \
lib include bin \
inst/post
ifneq ($(wildcard $(MODDIR)/make/ytools.mk),)
ifneq ($(wildcard $(MODDIR)/make/proj.mk),)
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/subdirs.mk
include $(MODDIR)/make/rules.mk

2
bin/Makefile
View file

@ -31,7 +31,7 @@
MODDIR = ..
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/scripts.mk
all:

2
make/Makefile
View file

@ -5,5 +5,5 @@
MODDIR = ..
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/make.mk

62
make/proj.mk.in Normal file
View file

@ -0,0 +1,62 @@
# (c) 2001 jannet it services
# contact@jannet.de
# $Id$
PROJECT := ytools
TOPDIR = $(MODDIR)
REQUIRED = inst/pre \
make \
doc \
debug misc slog platform \
devutil \
hash \
hexdump \
lbuffer \
debug \
cfgfile gtopts \
lock sigsync shmem \
usrv uclnt statecheck msgfmt \
YMisc YError \
YThread YMutex YEvent YCbContr contr/Y2WayMap \
YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
lib include bin \
inst/post
VERSION = @PACKAGE_VERSION@
VERSION_STR = \"@PACKAGE_VERSION@\"
DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
# rpmdist.mk variables
MKSPEC_SH = $(MODDIR)/devutil/scripts/mkspec_wrapper.sh $(TOPDIR)/make/mkspec.sh
FTP_SRC_GROUP = ytsrc
FTP_SRC_USER = jan
FTP_RUN_GROUP = ytrun
FTP_RUN_USER = jan
FTP_DEV_GROUP = ytdev
FTP_DEV_USER = jan
FTP_HOST = ftp.jannet.de
FTP_FILE_MODE = 644
FTP_DIR_MODE = 755
#FTP_HOST = ftp.jannet.de
FTP_HOST_LOGIN = root
ifeq ($(DEVELOPMENT),true)
include $(TOPDIR)/make/cfg_dev.mk
else
include $(TOPDIR)/make/cfg_dist.mk
endif
LDFLAGS += -lytools -ldl -pthread
ARCH = @ARCH@
LD_LIB_PATH=$(TOPDIR)/lib
ifeq (@ARCH@,x86)
PROJECT_LDFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib/pkgconfig; pkg-config --libs glib-2.0)
else
ifeq (@ARCH@,x86_64)
PROJECT_LDFLAGS += $(shell export PKG_CONFIG_PATH=/opt/gnome/lib64/pkgconfig; pkg-config --libs glib-2.0)
endif
endif

2
scripts/Makefile
View file

@ -31,7 +31,7 @@
MODDIR = ../..
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
EXE_SH += cvsbuild

2
tmpl/tex/Makefile
View file

@ -1,5 +1,5 @@
MODDIR=..
SUBDIRS = $(FIND_SUBDIRS)
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/dirs.mk

2
tmpl/tex/de_contract/Makefile
View file

@ -4,5 +4,5 @@
MODDIR = ../..
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/text.mk

2
tmpl/tex/de_technical/Makefile
View file

@ -4,5 +4,5 @@
MODDIR = ../..
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/text.mk

2
tmpl/tex/en_technical/Makefile
View file

@ -4,5 +4,5 @@
MODDIR = ../..
include $(MODDIR)/make/ytools.mk
include $(MODDIR)/make/proj.mk
include $(MODDIR)/make/text.mk