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
Releases
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
Johnny Cai
wine
Commits
7dd9e339
Commit
7dd9e339
authored
22 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
Install more of the Winelib programs by default (based on a patch by
Andriy Palamarchuk).
parent
6e5d46e8
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
Makefile.in
+5
-12
5 additions, 12 deletions
Makefile.in
programs/Makefile.in
+26
-14
26 additions, 14 deletions
programs/Makefile.in
with
31 additions
and
26 deletions
Makefile.in
+
5
−
12
View file @
7dd9e339
...
...
@@ -29,8 +29,8 @@ PROGRAMS = \
# Programs that link with libwine
LIBPROGRAMS
=
\
debugger
/winedbg
\
programs
/wineconsole/wineconsole
debugger
\
programs
# Libraries (not dlls) to build
LIBRARIES
=
\
...
...
@@ -54,8 +54,7 @@ LIBSYMLINKS = \
SUBDIRS
=
\
$(
INSTALLSUBDIRS
)
\
libtest
\
miscemu
\
programs
miscemu
# Sub-directories to run make install into
INSTALLSUBDIRS
=
\
...
...
@@ -65,7 +64,7 @@ INSTALLSUBDIRS = \
include
\
library
\
ole
\
programs
/wineconsole
\
programs
\
server
\
tools
\
tsx11
\
...
...
@@ -103,7 +102,7 @@ install:: all install_wine $(INSTALLSUBDIRS:%=%/__install__)
uninstall
::
$(INSTALLSUBDIRS:%=%/__uninstall__)
cd
$(
bindir
)
&&
$(
RM
)
wine
$(EMUOBJS) $(PROGRAMS)
$(LIBPROGRAMS)
$(LIBRARIES)
:
dummy
$(EMUOBJS) $(PROGRAMS) $(LIBRARIES)
:
dummy
@
cd
`
dirname
$@
`
&&
$(
MAKE
)
`
basename
$@
`
# Symlinks to libraries that we need to link against
...
...
@@ -149,12 +148,6 @@ dlls: tools $(LIBRARIES)
checklink
::
$(
CC
)
-o
checklink
$(
TOPSRCDIR
)
/library/checklink.c
$(
LIBWINE
)
$(
LIBS
)
&&
$(
RM
)
checklink
install_programs
:
dummy
@
cd
programs
&&
$(
MAKE
)
install
uninstall_programs
:
dummy
@
cd
programs
&&
$(
MAKE
)
uninstall
checklink
::
@
cd
dlls
&&
$(
MAKE
)
checklink
@
cd
debugger
&&
$(
MAKE
)
checklink
...
...
This diff is collapsed.
Click to expand it.
programs/Makefile.in
+
26
−
14
View file @
7dd9e339
...
...
@@ -4,37 +4,49 @@ SRCDIR = @srcdir@
VPATH
=
@srcdir@
MODULE
=
none
SUBDIRS
=
\
avitools
\
clock
\
cmdlgtst
\
INSTALLSUBDIRS
=
\
control
\
notepad
\
osversioncheck
\
progman
\
regapi
\
regedit
\
regsvr32
\
regtest
\
uninstaller
\
view
\
wcmd
\
wineconsole
\
winemine
\
winetest
\
winhelp
\
winver
all
:
$(SUBDIRS)
# Programs that are not generally useful and don't get installed
# Use 'make everything' to build them
OTHERSUBDIRS
=
\
avitools
\
clock
\
cmdlgtst
\
osversioncheck
\
regapi
\
regtest
\
view
\
winetest
SUBDIRS
=
$(
INSTALLSUBDIRS
)
$(
OTHERSUBDIRS
)
all
:
$(INSTALLSUBDIRS)
@MAKE_RULES@
$(SUBDIRS
:
%=%/__checklink__): dummy
@
cd
`
dirname
$@
`
&&
$(
MAKE
)
checklink
everything
:
$(SUBDIRS)
install
:
:
$(SUBDIRS:%=%/__install__)
install
-everything
:
$(SUBDIRS:%=%/__install__)
uninstall
::
$(SUBDIRS:%=%/__uninstall__)
uninstall-everything
:
$(SUBDIRS:%=%/__uninstall__)
install
::
$(INSTALLSUBDIRS:%=%/__install__)
uninstall
::
$(INSTALLSUBDIRS:%=%/__uninstall__)
$(SUBDIRS
:
%=%/__checklink__): dummy
@
cd
`
dirname
$@
`
&&
$(
MAKE
)
checklink
checklink
::
$(SUBDIRS:%=%/__checklink__)
...
...
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