X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fc-vars.make;h=5fcc77c409a18a9844192770a8c42c45a5b5fdd4;hb=52ddc3c8279a2f91d7e482aa69dd14e3593e1e98;hp=4009610f31286de256d14a87ea8c43e587a12ae1;hpb=07d4d05df6479d58c3c5152c07d7c86b94ee98b4;p=lilypond.git

diff --git a/stepmake/stepmake/c-vars.make b/stepmake/stepmake/c-vars.make
index 4009610f31..5fcc77c409 100644
--- a/stepmake/stepmake/c-vars.make
+++ b/stepmake/stepmake/c-vars.make
@@ -1,24 +1,18 @@
+include $(stepdir)/compile-vars.make
 
-# header files:
-H_FILES := $(wildcard *.h)
-C_FILES := $(wildcard *.c)
-Y_FILES := $(wildcard *.y)
-L_FILES := $(wildcard *.l)
+H_FILES := $(call src-wildcard,*.h)
+C_FILES := $(call src-wildcard,*.c)
+Y_FILES := $(call src-wildcard,*.y)
+L_FILES := $(call src-wildcard,*.l)
 
 SOURCE_FILES+=$(Y_FILES) $(C_FILES) $(L_FILES) $(H_FILES)
 
 O_FILES+=$(addprefix $(outdir)/, $(Y_FILES:.y=.o) $(C_FILES:.c=.o) $(L_FILES:.l=.o))
 
-TAGS_FILES += $(C_FILES) $(H_FILES)
-# C/C++
-# 
+TAGS_SOURCES += $(C_FILES)
+TAGS_HEADERS += $(H_FILES)
 
 ALL_C_SOURCES += $(H_FILES) $(C_FILES) $(Y_FILES) $(L_FILES)
 
-# compiler:
-#
-DO_C_COMPILE = $(DODEP) $(CC) -c   $(CFLAGS)  $(C_OUTPUT_OPTION)
-C_OUTPUT_OPTION =  -o $@ $<
-
-CFLAGS = $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS)
-
+ALL_CPPFLAGS = $(CPPFLAGS) $(CONFIG_CPPFLAGS) $(DEFINES) $(INCLUDES:%=-I%)
+ALL_CFLAGS = $(CFLAGS) $(ALL_CPPFLAGS) $(CONFIG_CFLAGS) $(MODULE_CFLAGS) $(EXTRA_CFLAGS)