Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yoann Laissus
wine
Commits
24c3c5ed
Commit
24c3c5ed
authored
24 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Revived the GEN_C_SRCS variable to support wrc lex/yacc sources.
parent
557d8af5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Make.rules.in
+7
-6
7 additions, 6 deletions
Make.rules.in
tools/wrc/Makefile.in
+5
-4
5 additions, 4 deletions
tools/wrc/Makefile.in
with
12 additions
and
10 deletions
Make.rules.in
+
7
−
6
View file @
24c3c5ed
...
...
@@ -9,6 +9,7 @@
# Each individual makefile may define the following additional variables:
# C_SRCS : C sources for the module
# ASM_SRCS : assembly sources
# GEN_C_SRCS : generated C files
# GEN_ASM_SRCS : generated assembly sources
# RC_SRCS : resource source files
# SPEC_SRCS : interface definition files
...
...
@@ -74,10 +75,10 @@ mandir = @mandir@
prog_manext = 1
conf_manext = 5
includedir = @includedir@/wine
CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej
*.flc
\
*.spec.c *.glue.c y.tab.c y.tab.h lex.yy.c core
CLEAN_FILES = *.o *.a *.so *.ln \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
*.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)
LINTS = $(C_SRCS:.c=.ln)
...
...
@@ -250,8 +251,8 @@ winapi_check::
$(SUBDIRS:%=%/__depend__): $(MAKEDEP) dummy
cd `dirname $@` && $(MAKE) depend
depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS) $(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS)
depend: $(MAKEDEP) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS)
$(GEN_C_SRCS)
$(SUBDIRS:%=%/__depend__)
$(MAKEDEP) $(DIVINCL) -C$(SRCDIR) $(C_SRCS) $(RC_SRCS) $(EXTRA_SRCS)
-C. $(GEN_C_SRCS)
# Rules for cleaning
...
...
@@ -262,7 +263,7 @@ $(EXTRASUBDIRS:%=%/__clean__): dummy
-cd `dirname $@` && $(RM) $(CLEAN_FILES)
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
...
...
This diff is collapsed.
Click to expand it.
tools/wrc/Makefile.in
+
5
−
4
View file @
24c3c5ed
...
...
@@ -19,12 +19,13 @@ C_SRCS = \
wrc.c
\
writeres.c
EXTRA_SRCS
=
parser.y parser.l ppl.l ppy.y ppy.tab.c lex.ppl.c
EXTRA_OBJS
=
y.tab.o lex.yy.o ppy.tab.o lex.ppl.o
GEN_C_SRCS
=
ppy.tab.c lex.ppl.c
EXTRA_SRCS
=
parser.y parser.l
EXTRA_OBJS
=
y.tab.o lex.yy.o
all
:
$(PROGRAMS)
depend
:
y.tab.h ppy.tab.h
ppy.tab.c lex.ppl.c
depend
:
y.tab.h ppy.tab.h
@MAKE_RULES@
...
...
@@ -44,7 +45,7 @@ lex.ppl.c: ppl.l
$(
LEX
)
$(
LEXOPT
)
-d
-Ppp
-8
-olex
.ppl.c
$(
SRCDIR
)
/ppl.l
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)
[
-d
$(
bindir
)
]
||
$(
MKDIR
)
$(
bindir
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment