Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
ec847821
Commit
ec847821
authored
Nov 30, 2020
by
Christoffer Ackelman
Committed by
Esteban Blanc
Dec 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing makefile rule for .dat files.
parent
066b53df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
src/tools/bld/src/lib_generic.mk
src/tools/bld/src/lib_generic.mk
+12
-1
src/tools/bld/src/rules.mk
src/tools/bld/src/rules.mk
+4
-0
No files found.
src/tools/bld/src/lib_generic.mk
View file @
ec847821
...
...
@@ -28,6 +28,7 @@ vpath %.pdr $(co_source)
vpath
%.java
$(co_source)
vpath
%.pwsg
$(co_source)
vpath
%.meth
$(co_source)
vpath
%.dat
$(co_source)
sources
:=
$(
sort
\
$(
foreach
file,
\
...
...
@@ -110,6 +111,15 @@ meth_sources := $(sort \
)
\
)
dat_sources
:=
$(
sort
\
$(
foreach
file,
\
$(
foreach
dir
,
\
$(source_dirs)
,
\
$(
wildcard
$(dir)
/
*
.dat
)
\
)
,
$(
notdir
$(file)
)
\
)
\
)
cqt_objects
:=
$(
patsubst
%.cqt, %_moc.o,
$(cqt_sources)
)
xdr_includes
:=
$(
addprefix
$(inc_dir)
/,
$(
patsubst
%.x, %.h,
$(xdr_sources)
))
...
...
@@ -123,6 +133,7 @@ export_includes += $(xdr_includes) $(pdr_includes)
export_pwsg
:=
$(
addprefix
$(exe_dir)
/,
$(pwsg_sources)
)
export_meth
:=
$(
addprefix
$(inc_dir)
/,
$(meth_sources)
)
export_dat
:=
$(
addprefix
$(exe_dir)
/,
$(dat_sources)
)
clean_h_includes
:=
$(
patsubst
%.h,clean_%.h,
$(h_includes)
)
clean_hpp_includes
:=
$(
patsubst
%.hpp,clean_%.hpp,
$(hpp_includes)
)
...
...
@@ -154,7 +165,7 @@ all : init copy lib exe | silent
init
:
dirs | silent
copy
:
$(export_includes) $(l_copy) $(export_pwsg) $(export_meth) | silent
copy
:
$(export_includes) $(l_copy) $(export_pwsg) $(export_meth)
$(export_dat)
| silent
lib
:
$(export_lib) | silent
...
...
src/tools/bld/src/rules.mk
View file @
ec847821
...
...
@@ -256,6 +256,10 @@ $(web_dir)/%.pbm : %.pbm
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
$(exe_dir)/%.dat
:
%.dat
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
$(exe_dir)/%.html
:
%.html
@
$(log_h_h)
@
$(cp)
$(cpflags)
$(source)
$(target)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment