Stick NONGENERATED_ in the front of the macros listing non-generated

files.  Define C_FILES and CPP_FILES in Makefile.common.inc to include
*all* C and C++ files, respectively, including generated files.

svn path=/trunk/; revision=47557
This commit is contained in:
Guy Harris 2013-02-08 05:31:13 +00:00
parent ddd4e48890
commit a52fedeece
2 changed files with 21 additions and 9 deletions

View File

@ -65,8 +65,8 @@ REGISTER_SRC_FILES = \
$(FLEX_GENERATED_REGISTER_CPP_FILES) \
$(LEMON_GENERATED_REGISTER_C_FILES) \
$(LEMON_GENERATED_REGISTER_CPP_FILES) \
$(REGISTER_C_FILES) \
$(REGISTER_CPP_FILES)
$(NONGENERATED_REGISTER_C_FILES) \
$(NONGENERATED_REGISTER_CPP_FILES)
#
# All distributed source files.
@ -74,8 +74,8 @@ REGISTER_SRC_FILES = \
SRC_FILES = \
$(FLEX_GENERATED_C_FILES) \
$(FLEX_GENERATED_CPP_FILES) \
$(C_FILES) \
$(CPP_FILES)
$(NONGENERATED_C_FILES) \
$(NONGENERATED_CPP_FILES)
#
# All non-distributed source files.
@ -100,5 +100,17 @@ GENERATED_SRC_FILES = \
# Lemon-generated files can currently be guaranteed to be clean.
#
CLEAN_SRC_FILES = \
$(C_FILES) \
$(CPP_FILES)
$(NONGENERATED_C_FILES) \
$(NONGENERATED_CPP_FILES)
# C source files
C_FILES = \
$(FLEX_GENERATED_C_FILES) \
$(LEMON_GENERATED_C_FILES) \
$(NONGENERATED_C_FILES)
# C++ source files
CPP_FILES = \
$(FLEX_GENERATED_CPP_FILES) \
$(LEMON_GENERATED_CPP_FILES) \
$(NONGENERATED_CPP_FILES)

View File

@ -45,12 +45,12 @@ LEMON_GENERATED_HEADER_FILES = \
mate_grammar.h
# Non-generated sources to be scanned for registration routines
REGISTER_C_FILES = \
NONGENERATED_REGISTER_C_FILES = \
packet-mate.c
# Non-generated sources
C_FILES = \
$(REGISTER_C_FILES) \
NONGENERATED_C_FILES = \
$(NONGENERATED_REGISTER_C_FILES) \
mate_setup.c \
mate_runtime.c \
mate_util.c