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

topdir.mk: Revert to using subdirs.mk

Browse source 
Revert to using subdirs.mk instead of dirs.mk in topdir.mk.

make config produces a clash between the phony target and some
modules having a subdirectory named "config", notably feedfs, jux and
casview (should be renamed to conf one day, all other modules have
"conf") with dirs.mk.
This commit is contained in:
Jan Lindemann 2010-12-04 13:59:26 +00:00 • committed by Jan Lindemann
commit 14df6b25bb
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/topdir.mk
View file

@ -1,7 +1,6 @@
all: config all: config
install: topdir.install install: topdir.install
clean: topdir.clean clean: topdir.clean
distclean: topdir.distclean
config: config:
SUBDIRS ?= $(wildcard inst/pre make scripts tools src include lib bin \ SUBDIRS ?= $(wildcard inst/pre make scripts tools src include lib bin \
@ -12,11 +11,13 @@ ifneq ($(wildcard $(TOPDIR)/make/defs.mk),)
endif endif
include $(MODDIR)/make/defs.mk include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/subdirs.mk
include $(MODDIR)/make/rpmdist.mk include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/dirs.mk
include $(MODDIR)/make/rules.mk include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/doc-rules.mk include $(MODDIR)/make/doc-rules.mk
distclean: topdir.distclean
INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS)) INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS))
local-%: local-%: