Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Timo Koch
dune-common
Commits
4198f254
Commit
4198f254
authored
16 years ago
by
Christian Engwer
Browse files
Options
Downloads
Patches
Plain Diff
make buildsystem work with mac os x (fix 387)
[[Imported from SVN: r5211]]
parent
e298331f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
am/doxygen
+3
-2
3 additions, 2 deletions
am/doxygen
am/webstuff
+7
-1
7 additions, 1 deletion
am/webstuff
bin/dune-autogen
+2
-2
2 additions, 2 deletions
bin/dune-autogen
doc/doxygen/Makefile.am
+1
-0
1 addition, 0 deletions
doc/doxygen/Makefile.am
with
13 additions
and
5 deletions
am/doxygen
+
3
−
2
View file @
4198f254
...
...
@@ -6,6 +6,7 @@ if BUILD_DOCS
# EXTRAINSTALL in the html subdirectory
DOXYGENHTMLFILES = *.html *.css *.png *.gif
# DOXYGENDISTFILES = html html/*.html html/*.css html/*.png html/*.gif doxygen-tag
DOXYGENDISTFILES =
DOXYGENINSTALL = $(DOXYGENHTMLFILES) ../doxygen.log
endif
...
...
@@ -77,10 +78,10 @@ web-install-doxygen:
EXTRAINSTALL="$(DOXYGENINSTALL)" CURDIR="$(CURDIR)/@DUNE_MOD_NAME@-html" install ; \
popd; \
fi
web-install: web-install-doxygen
endif
web-install: web-install-doxygen web-install-default
clean-local: clean-doxygen
clean-doxygen:
...
...
This diff is collapsed.
Click to expand it.
am/webstuff
+
7
−
1
View file @
4198f254
...
...
@@ -11,12 +11,14 @@
# pass files through wrapper
# pass variables to wmlwrap via environment
if
WML
.wml.html
:
export
DUNEWEBDIR
=
$(
DUNEWEBDIR
);
\
export
BASEDIR
=
$(
BASEDIR
);
\
sh
$(
DUNE_COMMON_ROOT
)
/bin/wmlwrap
-I
$(
srcdir
)
$<
-o
$@
web-install
:
all
web-install
-default
:
all
if
test
-d
$(
DUNEWEBDIR
)
&&
test
-r
$(
DUNEWEBDIR
)
/Make.global
;
then
\
for
DIR
in
$(
SUBDIRS
)
;
do
\
$(
MAKE
)
-C
$$
DIR web-install
||
exit
1
;
\
...
...
@@ -24,3 +26,7 @@ web-install: all
$(
MAKE
)
-f
$(
DUNEWEBDIR
)
/Make.global
\
EXTRAINSTALL
=
"
$(
EXTRAINSTALL
)
"
CURDIR
=
"
$(
CURDIR
)
"
install
;
\
fi
endif
web-install
:
web-install-default
This diff is collapsed.
Click to expand it.
bin/dune-autogen
+
2
−
2
View file @
4198f254
...
...
@@ -99,7 +99,7 @@ dunecontrol --only=$name m4create
echo
"--> aclocal..."
rm
-f
aclocal.m4
rm
-rf
autom4te.cache
aclocal
$AMVERSION
-I
.
$ACLOCAL_FLAGS
aclocal
$AMVERSION
-I
.
$ACLOCAL_FLAGS
# create a link to the dune-common am directory
if
[
"
$name
"
!=
"dune-common"
]
;
then
...
...
@@ -120,7 +120,7 @@ echo "--> autoheader..."
autoheader
$ACVERSION
echo
"--> automake..."
automake
$AMVERSION
--add-missing
automake
$AMVERSION
-W
all
--add-missing
echo
"--> autoconf..."
autoconf
$ACVERSION
...
...
This diff is collapsed.
Click to expand it.
doc/doxygen/Makefile.am
+
1
−
0
View file @
4198f254
...
...
@@ -3,6 +3,7 @@
# setting like in dune-web
BASEDIR
=
../..
CURDIR
=
doc/doxygen
WHAT
=
if
BUILD_DOCS
if
WML
...
...
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