Skip to content

Commit

Permalink
Makefile: remove Makefile.conf dependency on mem_stats
Browse files Browse the repository at this point in the history
  • Loading branch information
razvancrainea committed Jan 26, 2017
1 parent 0b80ace commit b719e45
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Makefile.modules
Expand Up @@ -33,12 +33,12 @@ ALLDEP+=../../Makefile ../../Makefile.defs

endif

include ../../Makefile.sources

ifneq (,$(findstring SHM_EXTRA_STATS, $(DEFS)))
ALLDEP += ../../mem/mem_stats.h
endif

include ../../Makefile.sources

ifeq (,$(filter $(MOD_NAME), $(static_modules)))
CFLAGS:=$(MOD_CFLAGS)
LDFLAGS:=$(MOD_LDFLAGS)
Expand Down
4 changes: 2 additions & 2 deletions Makefile.rules
Expand Up @@ -64,7 +64,7 @@ Makefile.conf: Makefile.conf.template
cp $< $@; \
fi

%mem_stats.c: %/../Makefile.conf $(NEWREVISION)
%mem_stats.c: $(NEWREVISION)
@find $(dir $@)/../modules/ -name "[Mm]akefile" -exec grep NAME= {} \; \
| awk 'BEGIN { FS = "[=\\. ]"; \
print "/* This file is auto-generated by running \"make generate-mem-stats\" */"; \
Expand All @@ -74,7 +74,7 @@ Makefile.conf: Makefile.conf.template
{ print "unsigned long " $$(NF-1) "_mem_stat;" } \
END { print "#endif /* SHM_EXTRA_STATS */"}' > $@

%mem_stats.h: %/../Makefile.conf $(NEWREVISION)
%mem_stats.h: $(NEWREVISION)
@find $(dir $@)/../modules/ -name "[Mm]akefile" -exec grep NAME= {} \; \
| awk 'BEGIN { FS = "[=\\. ]"; \
print "/* This file is auto-generated by running \"make generate-mem-stats\" */"; \
Expand Down

0 comments on commit b719e45

Please sign in to comment.