Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e84063bf
Commit
e84063bf
authored
Mar 25, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Output the top-level installation rules explicitly for each module.
parent
eab7efd1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
55 deletions
+26
-55
Makefile.in
Makefile.in
+0
-41
aclocal.m4
aclocal.m4
+13
-6
configure
configure
+13
-8
No files found.
Makefile.in
View file @
e84063bf
...
...
@@ -28,17 +28,6 @@ LIBEXT = @LIBEXT@
MODULE
=
none
ALL_DIRS
=
@ALL_DIRS@
ALL_TOP_DIRS
=
@ALL_TOP_DIRS@
# Sub-directories to run make all into
BUILDSUBDIRS
=
\
libs/wine
\
$(ALL_TOP_DIRS)
# Sub-directories to run make install/uninstall into
INSTALLSUBDIRS
=
\
libs/wine
\
$(ALL_TOP_DIRS)
# Sub-directories that don't have a makefile
EXTRASUBDIRS
=
dlls libs
...
...
@@ -74,8 +63,6 @@ $(ALL_CONFIGS):
# Rules for building
all
:
$(BUILDSUBDIRS)
$(ALL_DIRS)
:
dummy
@
cd
$@
&&
$(MAKE)
...
...
@@ -100,28 +87,6 @@ distclean:: clean
.PHONY
:
distclean $(ALL_DIRS:%=%/__clean__)
# Rules for installing
$(INSTALLSUBDIRS
:
%=%/__install__): dummy
@
cd
`
dirname
$@
`
&&
$(MAKE)
install
$(INSTALLSUBDIRS
:
%=%/__install-lib__): dummy
@
cd
`
dirname
$@
`
&&
$(MAKE)
install-lib
$(INSTALLSUBDIRS
:
%=%/__install-dev__): dummy
@
cd
`
dirname
$@
`
&&
$(MAKE)
install-dev
$(INSTALLSUBDIRS
:
%=%/__uninstall__): dummy
@
cd
`
dirname
$@
`
&&
$(MAKE)
uninstall
install
::
$(INSTALLSUBDIRS:%=%/__install__) dummy
install-lib
::
$(INSTALLSUBDIRS:%=%/__install-lib__) dummy
install-dev
::
$(INSTALLSUBDIRS:%=%/__install-dev__) dummy
uninstall
::
$(INSTALLSUBDIRS:%=%/__uninstall__) dummy
.PHONY
:
$(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__)
\
$(INSTALLSUBDIRS:%=%/__install-lib__) $(INSTALLSUBDIRS:%=%/__install-dev__)
# Dependencies between directories
# dependencies needed to build any dll or program
...
...
@@ -136,12 +101,6 @@ libs/wine: libs/port
tools/wmc tools/wrc
:
tools
tools tools/wmc tools/wrc
:
libs/wine
tools/widl tools/wmc tools/wrc
:
libs/wpp
fonts/__install__ fonts/__install-lib__
:
tools
include/__install__ include/__install-dev__
:
include
libs/wine/__install__ libs/wine/__install-lib__ libs/wine/__install-dev__
:
libs/wine
loader/__install__ loader/__install-lib__
:
libs/port libs/wine tools
server/__install__ server/__install-lib__
:
libs/port libs/wine tools
tools/__depend__
:
$(MAKEDEP)
$(MAKEDEP)
:
include/config.h tools/Makefile
...
...
aclocal.m4
View file @
e84063bf
...
...
@@ -147,7 +147,6 @@ AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
AC_SUBST(ALL_MAKERULES,"")
AC_SUBST(ALL_SYMLINKS,"")
AC_SUBST(ALL_DIRS,"")
AC_SUBST(ALL_TOP_DIRS,"")
AC_SUBST(ALL_TEST_BINARIES,"")
AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"")
...
...
@@ -167,13 +166,21 @@ wine_fn_config_makefile ()
ac_enable=$[2]
wine_fn_append_file ALL_DIRS $ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"$ac_dir/__clean__
$ac_dir/__install__ $ac_dir/__install-dev__ $ac_dir/__install-lib__ $ac_dir/__uninstall__ $ac_dir
: $ac_dir/Makefile
"$ac_dir/__clean__: $ac_dir/Makefile
$ac_dir/Makefile $ac_dir/__depend__: $ac_dir/Makefile.in config.status Make.rules \$(MAKEDEP)
@./config.status --file $ac_dir/Makefile && cd $ac_dir && \$(MAKE) depend"
AS_VAR_IF([$ac_enable],[no],,[case $ac_dir in
*/*) ;;
*) wine_fn_append_file ALL_TOP_DIRS $ac_dir ;;
esac])
AS_VAR_IF([$ac_enable],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"all: $ac_dir
$ac_dir: $ac_dir/Makefile
install:: $ac_dir
@cd $ac_dir && \$(MAKE) install
install-lib:: $ac_dir
@cd $ac_dir && \$(MAKE) install-lib
install-dev:: $ac_dir
@cd $ac_dir && \$(MAKE) install-dev
uninstall:: $ac_dir/Makefile
@cd $ac_dir && \$(MAKE) uninstall"])
}
wine_fn_config_lib ()
...
...
configure
View file @
e84063bf
...
...
@@ -598,7 +598,6 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_TEST_BINARIES
ALL_TOP_DIRS
ALL_DIRS
ALL_SYMLINKS
ALL_MAKERULES
...
...
@@ -13858,8 +13857,6 @@ ALL_SYMLINKS=""
ALL_DIRS
=
""
ALL_TOP_DIRS
=
""
ALL_TEST_BINARIES
=
""
ALL_PROGRAM_BIN_INSTALL_DIRS
=
""
...
...
@@ -13881,17 +13878,25 @@ wine_fn_config_makefile ()
ac_enable
=
$2
wine_fn_append_file ALL_DIRS
$ac_dir
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"
$ac_dir
/__clean__
$ac_dir
/__install__
$ac_dir
/__install-dev__
$ac_dir
/__install-lib__
$ac_dir
/__uninstall__
$ac_dir
:
$ac_dir
/Makefile
"
$ac_dir
/__clean__:
$ac_dir
/Makefile
$ac_dir
/Makefile
$ac_dir
/__depend__:
$ac_dir
/Makefile.in config.status Make.rules
\$
(MAKEDEP)
@./config.status --file
$ac_dir
/Makefile && cd
$ac_dir
&&
\$
(MAKE) depend"
eval
as_val
=
\$
$ac_enable
if
test
"x
$as_val
"
=
x
""
no
;
then
:
else
case
$ac_dir
in
*
/
*
)
;;
*
)
wine_fn_append_file ALL_TOP_DIRS
$ac_dir
;;
esac
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"all:
$ac_dir
$ac_dir
:
$ac_dir
/Makefile
install::
$ac_dir
@cd
$ac_dir
&&
\$
(MAKE) install
install-lib::
$ac_dir
@cd
$ac_dir
&&
\$
(MAKE) install-lib
install-dev::
$ac_dir
@cd
$ac_dir
&&
\$
(MAKE) install-dev
uninstall::
$ac_dir
/Makefile
@cd
$ac_dir
&&
\$
(MAKE) uninstall"
fi
}
...
...
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