Commit 24c3c5ed authored by Alexandre Julliard's avatar Alexandre Julliard

Revived the GEN_C_SRCS variable to support wrc lex/yacc sources.

parent 557d8af5
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# Each individual makefile may define the following additional variables: # Each individual makefile may define the following additional variables:
# C_SRCS : C sources for the module # C_SRCS : C sources for the module
# ASM_SRCS : assembly sources # ASM_SRCS : assembly sources
# GEN_C_SRCS : generated C files
# GEN_ASM_SRCS : generated assembly sources # GEN_ASM_SRCS : generated assembly sources
# RC_SRCS : resource source files # RC_SRCS : resource source files
# SPEC_SRCS : interface definition files # SPEC_SRCS : interface definition files
...@@ -74,10 +75,10 @@ mandir = @mandir@ ...@@ -74,10 +75,10 @@ mandir = @mandir@
prog_manext = 1 prog_manext = 1
conf_manext = 5 conf_manext = 5
includedir = @includedir@/wine includedir = @includedir@/wine
CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc \ CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
*.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core *.flc *.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core
OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \ OBJS = $(SPEC_SRCS:.spec=.spec.o) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) \
$(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS) $(ASM_SRCS:.S=.o) $(RC_SRCS:.rc=.o) $(GLUE:.c=.glue.o) $(EXTRA_OBJS)
LINTS = $(C_SRCS:.c=.ln) LINTS = $(C_SRCS:.c=.ln)
...@@ -250,8 +251,8 @@ winapi_check:: ...@@ -250,8 +251,8 @@ winapi_check::
$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy $(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
cd `dirname $@` && $(MAKE) depend cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(SUBDIRS:%=%/__depend__) depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(GEN_C_SRCS) $(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) -C. $(GEN_C_SRCS)
# Rules for cleaning # Rules for cleaning
...@@ -262,7 +263,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy ...@@ -262,7 +263,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
-cd `dirname $@` && $(RM) $(CLEAN_FILES) -cd `dirname $@` && $(RM) $(CLEAN_FILES)
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
$(RM) $(CLEAN_FILES) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(PROGRAMS) $(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.s) $(RC_SRCS:.rc=.h) $(PROGRAMS)
# Misc. rules # Misc. rules
......
...@@ -19,12 +19,13 @@ C_SRCS = \ ...@@ -19,12 +19,13 @@ C_SRCS = \
wrc.c \ wrc.c \
writeres.c writeres.c
EXTRA_SRCS = parser.y parser.l ppl.l ppy.y ppy.tab.c lex.ppl.c GEN_C_SRCS = ppy.tab.c lex.ppl.c
EXTRA_OBJS = y.tab.o lex.yy.o ppy.tab.o lex.ppl.o EXTRA_SRCS = parser.y parser.l
EXTRA_OBJS = y.tab.o lex.yy.o
all: $(PROGRAMS) all: $(PROGRAMS)
depend: y.tab.h ppy.tab.h ppy.tab.c lex.ppl.c depend: y.tab.h ppy.tab.h
@MAKE_RULES@ @MAKE_RULES@
...@@ -44,7 +45,7 @@ lex.ppl.c: ppl.l ...@@ -44,7 +45,7 @@ lex.ppl.c: ppl.l
$(LEX) $(LEXOPT) -d -Ppp -8 -olex.ppl.c $(SRCDIR)/ppl.l $(LEX) $(LEXOPT) -d -Ppp -8 -olex.ppl.c $(SRCDIR)/ppl.l
clean:: clean::
$(RM) y.tab.c y.tab.h lex.yy.c ppy.tab.c ppy.tab.h lex.ppl.c ppy.output lex.backup y.output $(RM) ppy.tab.h ppy.output lex.backup y.output
install:: $(PROGRAMS) install:: $(PROGRAMS)
[ -d $(bindir) ] || $(MKDIR) $(bindir) [ -d $(bindir) ] || $(MKDIR) $(bindir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment