janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 06:40:39 +01:00
Code Activity

topdir*.mk: autoconf stuff topdir.mk -> topdir-autoconf.mk

Browse source 
Source out autoconf conditionals from topdir.mk into
topdir-autoconf.mk.
This commit is contained in:
Jan Lindemann 2009-05-27 11:26:17 +00:00 • committed by Jan Lindemann
commit bd079bf1d3
3 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -31,7 +31,7 @@ SUBDIRS = inst/pre \
inst/post inst/post
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(TOPDIR)/make/topdir.mk include $(TOPDIR)/make/topdir-autoconf.mk
define symversion define symversion
nm $(LIB_A) | sed '/^[0-9]\{8\} T / !d; s/^[0-9]\{8\} T //' | sort -u nm $(LIB_A) | sed '/^[0-9]\{8\} T / !d; s/^[0-9]\{8\} T //' | sort -u

9
make/topdir-autoconf.mk Normal file
View file

@ -0,0 +1,9 @@
ifeq ($(wildcard $(TOPDIR)/make/defs.mk),)
ifneq ($(wildcard $(TOPDIR)/make/defs.mk.in),)
include $(MODDIR)/make/autoconf.mk
else
include $(MODDIR)/make/topdir.mk
endif
else
include $(MODDIR)/make/topdir.mk
endif

20
make/topdir.mk
View file

@ -1,5 +1,3 @@
SUBDIRS ?= make
all: config all: config
install: topdir.install install: topdir.install
clean: topdir.clean clean: topdir.clean
@ -7,28 +5,14 @@ distclean: topdir.distclean
config: config:
ifneq ($(wildcard $(TOPDIR)/make/defs.mk),) ifneq ($(wildcard $(TOPDIR)/make/defs.mk),)
include $(TOPDIR)/make/defs.mk
endif
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rpmdist.mk include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/subdirs.mk include $(MODDIR)/make/subdirs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk include $(MODDIR)/make/doc-rules.mk
else
ifeq ($(wildcard $(TOPDIR)/make/defs.mk.in),)
include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/subdirs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk
endif
endif
ifneq ($(wildcard $(TOPDIR)/make/defs.mk.in),)
include $(MODDIR)/make/autoconf.mk
endif
INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS)) INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS))
local-%: local-%: