janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make: Move defs.mk -> ytools.mk

Browse source
This commit is contained in:
Jan Lindemann 2002-07-20 10:26:53 +00:00 • committed by Jan Lindemann
commit 1223681535
4 changed files with 43 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
make/autoconf.mk
View file

@ -5,9 +5,14 @@
CLEAN += $(wildcard *.acdone)
DISTCLEAN += configure config.log autoscan.log configure.ac config.status
AC_FILES_IN = $(shell find . -name '*.in')
AC_FILES_IN = $(shell find . -name '*.in' | grep -v contrib)
AC_FILES = $(basename $(AC_FILES_IN))
all: config $(AC_FILES)
config: config.acdone
install: config $(AC_FILES)
confclean:
rm -f $(DISTCLEAN) $(CLEAN)
configure.ac: configure.ac.tmpl VERSION
cat $< | sed -e "s/_VERSION_/`cat VERSION | sed 's/-dev//'`/" > $@
@ -22,16 +27,10 @@ config.acdone: config.status
./config.status
touch $@
%.mk: %.mk.in config.status
$(TOPDIR)/make/%.mk: $(TOPDIR)/make/%.mk.in config.status
./config.status $@
touch $@
%.h: %.h.in config.status
$(TOPDIR)/make/%.h: $(TOPDIR)/make/%.h.in config.status
./config.status $@
touch $@
config: config.acdone
all: config $(AC_FILES)
install: config $(AC_FILES)
confclean:
rm -f $(DISTCLEAN) $(CLEAN)

40
make/defs.mk → make/defs-orig.mk
View file

@ -3,44 +3,17 @@
# contact@jannet.de
# $Id$
ifndef PROJECT
PROJECT := ytools
endif
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
include $(MODDIR)/make/projdefs.mk
ifndef LIBNAME
LIBNAME := $(PROJECT)
endif
ifndef TOPDIR
TOPDIR := $(MODDIR)
endif
VERSION = $(shell cat $(TOPDIR)/VERSION)
WINVERSION = $(shell cat $(TOPDIR)/VERSION | sed -e "s/\./_/g")
LOCAL_VERSION = $(shell cat $(TOPDIR)/VERSION)
LOCAL_WINVERSION = $(shell cat $(TOPDIR)/VERSION | sed -e "s/\./_/g")
LIBNAME := $(PROJECT)
WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
LOCAL_VERSION = $(shell echo $(VERSION))
LOCAL_WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
DIST_VERSION = $(shell echo $(VERSION) | sed -e "s/-dev//")
DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
DEVELOPMENT = $(shell cat $(TOPDIR)/VERSION | grep 'dev' >/dev/null && echo true)
DEVELOPMENT = $(shell echo $(VERSION) | grep 'dev' >/dev/null && echo true)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
FTP_PCKG_DIR = /pub/packages
@ -241,4 +214,3 @@ export LD_LIBRARY_PATH
UPLOAD_URL_RPM_BIN=rsync_ssh://ftp.jannet.de:/usr/local/ftp/pub/packages/rpm/bin/
UPLOAD_URL_RPM_SRC=rsync_ssh://ftp.jannet.de:/usr/local/ftp/pub/packages/rpm/src/

2
make/dirs.mk
View file

@ -12,7 +12,7 @@ clean distclean:
.DEFAULT:
install:
else
subdirs:
subdirs all:
$(make_subdirs)
clean distclean:

28
make/ytools.mk.in Normal file
View file

@ -0,0 +1,28 @@
# (c) 2001 jannet it services
# contact@jannet.de
# $Id$
PROJECT := ytools
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@\"