Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
718ea42f
Commit
718ea42f
authored
Mar 26, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Move wineapploader to the tools directory and get rid of the programs makefile.
parent
2fb30218
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
23 deletions
+12
-23
.gitignore
.gitignore
+1
-1
Makefile.in
Makefile.in
+1
-1
aclocal.m4
aclocal.m4
+3
-3
configure
configure
+3
-4
configure.ac
configure.ac
+0
-1
Makefile.in
programs/Makefile.in
+0
-13
Makefile.in
tools/Makefile.in
+4
-0
wineapploader.in
tools/wineapploader.in
+0
-0
No files found.
.gitignore
View file @
718ea42f
...
@@ -235,7 +235,6 @@ programs/rpcss/irot.h
...
@@ -235,7 +235,6 @@ programs/rpcss/irot.h
programs/rpcss/irot_s.c
programs/rpcss/irot_s.c
programs/services/svcctl.h
programs/services/svcctl.h
programs/services/svcctl_s.c
programs/services/svcctl_s.c
programs/wineapploader
programs/winedbg/dbg.tab.c
programs/winedbg/dbg.tab.c
programs/winedbg/dbg.tab.h
programs/winedbg/dbg.tab.h
programs/winedbg/debug.yy.c
programs/winedbg/debug.yy.c
...
@@ -260,6 +259,7 @@ tools/widl/parser.yy.c
...
@@ -260,6 +259,7 @@ tools/widl/parser.yy.c
tools/widl/widl
tools/widl/widl
tools/widl/widl.man
tools/widl/widl.man
tools/wine.inf
tools/wine.inf
tools/wineapploader
tools/winebuild/winebuild
tools/winebuild/winebuild
tools/winebuild/winebuild.man
tools/winebuild/winebuild.man
tools/winedump/winedump
tools/winedump/winedump
...
...
Makefile.in
View file @
718ea42f
...
@@ -24,7 +24,7 @@ SRCDIR = @srcdir@
...
@@ -24,7 +24,7 @@ SRCDIR = @srcdir@
VPATH
=
@srcdir@
VPATH
=
@srcdir@
# Sub-directories that don't have a makefile
# Sub-directories that don't have a makefile
EXTRASUBDIRS
=
dlls libs
EXTRASUBDIRS
=
dlls libs
programs
# Destination directories for make install
# Destination directories for make install
INSTALLDIRS
=
$(DESTDIR)$(bindir)
INSTALLDIRS
=
$(DESTDIR)$(bindir)
...
...
aclocal.m4
View file @
718ea42f
...
@@ -296,11 +296,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
...
@@ -296,11 +296,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
@cd programs/$ac_dir && \$(MAKE) install
@cd programs/$ac_dir && \$(MAKE) install
uninstall:: programs/$ac_dir/Makefile
uninstall:: programs/$ac_dir/Makefile
@cd programs/$ac_dir && \$(MAKE) uninstall"
@cd programs/$ac_dir && \$(MAKE) uninstall"
if test "$ac_install" = installbin -a -n "$DLLEXT" -a
-z "$WOW64_DISABLE"
if test "$ac_install" = installbin -a -n "$DLLEXT" -a
"x$enable_tools" != xno
then
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
wine_fn_append_rule ALL_MAKEFILE_DEPENDS \
"install install-lib::
program
s \$(DESTDIR)\$(bindir)
"install install-lib::
tool
s \$(DESTDIR)\$(bindir)
\$(INSTALL_SCRIPT)
program
s/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
\$(INSTALL_SCRIPT)
tool
s/wineapploader \$(DESTDIR)\$(bindir)/$ac_dir
uninstall::
uninstall::
\$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
\$(RM) \$(DESTDIR)\$(bindir)/$ac_dir"
fi])
fi])
...
...
configure
View file @
718ea42f
...
@@ -14009,11 +14009,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
...
@@ -14009,11 +14009,11 @@ programs/$ac_dir: programs/$ac_dir/Makefile __builddeps__ dummy
@cd programs/
$ac_dir
&&
\$
(MAKE) install
@cd programs/
$ac_dir
&&
\$
(MAKE) install
uninstall:: programs/
$ac_dir
/Makefile
uninstall:: programs/
$ac_dir
/Makefile
@cd programs/
$ac_dir
&&
\$
(MAKE) uninstall"
@cd programs/
$ac_dir
&&
\$
(MAKE) uninstall"
if
test
"
$ac_install
"
=
installbin
-a
-n
"
$DLLEXT
"
-a
-z
"
$WOW64_DISABLE
"
if
test
"
$ac_install
"
=
installbin
-a
-n
"
$DLLEXT
"
-a
"x
$enable_tools
"
!=
xno
then
then
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
wine_fn_append_rule ALL_MAKEFILE_DEPENDS
\
"install install-lib::
program
s
\$
(DESTDIR)
\$
(bindir)
"install install-lib::
tool
s
\$
(DESTDIR)
\$
(bindir)
\$
(INSTALL_SCRIPT)
program
s/wineapploader
\$
(DESTDIR)
\$
(bindir)/
$ac_dir
\$
(INSTALL_SCRIPT)
tool
s/wineapploader
\$
(DESTDIR)
\$
(bindir)/
$ac_dir
uninstall::
uninstall::
\$
(RM)
\$
(DESTDIR)
\$
(bindir)/
$ac_dir
"
\$
(RM)
\$
(DESTDIR)
\$
(bindir)/
$ac_dir
"
fi
fi
...
@@ -14633,7 +14633,6 @@ wine_fn_config_makefile libs/port enable_libs_port
...
@@ -14633,7 +14633,6 @@ wine_fn_config_makefile libs/port enable_libs_port
wine_fn_config_makefile libs/wine enable_libs_wine
wine_fn_config_makefile libs/wine enable_libs_wine
wine_fn_config_makefile libs/wpp enable_libs_wpp
wine_fn_config_makefile libs/wpp enable_libs_wpp
wine_fn_config_makefile loader enable_loader
wine_fn_config_makefile loader enable_loader
wine_fn_config_makefile programs enable_programs
wine_fn_config_program attrib enable_attrib
install
wine_fn_config_program attrib enable_attrib
install
wine_fn_config_program cacls enable_cacls
install
wine_fn_config_program cacls enable_cacls
install
wine_fn_config_program clock enable_clock
install
wine_fn_config_program clock enable_clock
install
...
...
configure.ac
View file @
718ea42f
...
@@ -2634,7 +2634,6 @@ WINE_CONFIG_MAKEFILE([libs/port])
...
@@ -2634,7 +2634,6 @@ WINE_CONFIG_MAKEFILE([libs/port])
WINE_CONFIG_MAKEFILE([libs/wine])
WINE_CONFIG_MAKEFILE([libs/wine])
WINE_CONFIG_MAKEFILE([libs/wpp])
WINE_CONFIG_MAKEFILE([libs/wpp])
WINE_CONFIG_MAKEFILE([loader])
WINE_CONFIG_MAKEFILE([loader])
WINE_CONFIG_MAKEFILE([programs])
WINE_CONFIG_PROGRAM(attrib,install)
WINE_CONFIG_PROGRAM(attrib,install)
WINE_CONFIG_PROGRAM(cacls,install)
WINE_CONFIG_PROGRAM(cacls,install)
WINE_CONFIG_PROGRAM(clock,install)
WINE_CONFIG_PROGRAM(clock,install)
...
...
programs/Makefile.in
deleted
100644 → 0
View file @
2fb30218
TOPSRCDIR
=
@top_srcdir@
TOPOBJDIR
=
..
SRCDIR
=
@srcdir@
VPATH
=
@srcdir@
PROGRAMS
=
wineapploader
@MAKE_RULES@
all
:
$(PROGRAMS)
wineapploader
:
wineapploader.in
sed
-e
's,@bindir\@,
$(bindir)
,g'
$(SRCDIR)
/wineapploader.in
>
$@
||
(
$(RM)
$@
&&
false
)
tools/Makefile.in
View file @
718ea42f
...
@@ -15,6 +15,7 @@ PROGRAMS = \
...
@@ -15,6 +15,7 @@ PROGRAMS = \
relpath
$(EXEEXT)
\
relpath
$(EXEEXT)
\
sfnt2fnt
$(EXEEXT)
\
sfnt2fnt
$(EXEEXT)
\
wine.inf
\
wine.inf
\
wineapploader
\
wineprefixcreate
wineprefixcreate
MANPAGES
=
\
MANPAGES
=
\
...
@@ -64,6 +65,9 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT)
...
@@ -64,6 +65,9 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT)
wine.inf
:
wine.inf.in
wine.inf
:
wine.inf.in
LC_ALL
=
C
sed
-e
's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g'
$(SRCDIR)
/wine.inf.in
>
$@
||
(
$(RM)
$@
&&
false
)
LC_ALL
=
C
sed
-e
's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g'
$(SRCDIR)
/wine.inf.in
>
$@
||
(
$(RM)
$@
&&
false
)
wineapploader
:
wineapploader.in
sed
-e
's,@bindir\@,
$(bindir)
,g'
$(SRCDIR)
/wineapploader.in
>
$@
||
(
$(RM)
$@
&&
false
)
wineprefixcreate
:
wineprefixcreate.in relpath$(EXEEXT)
wineprefixcreate
:
wineprefixcreate.in relpath$(EXEEXT)
sed
-e
"s,@bintodlldir
\@
,
`
$(RELPATH)
$(bindir)
$(dlldir)
`
,g"
-e
"s,@bintodatadir
\@
,
`
$(RELPATH)
$(bindir)
$(datadir)
/wine
`
,g"
$(SRCDIR)
/wineprefixcreate.in
>
$@
||
(
$(RM)
$@
&&
false
)
sed
-e
"s,@bintodlldir
\@
,
`
$(RELPATH)
$(bindir)
$(dlldir)
`
,g"
-e
"s,@bintodatadir
\@
,
`
$(RELPATH)
$(bindir)
$(datadir)
/wine
`
,g"
$(SRCDIR)
/wineprefixcreate.in
>
$@
||
(
$(RM)
$@
&&
false
)
chmod
+x wineprefixcreate
chmod
+x wineprefixcreate
...
...
program
s/wineapploader.in
→
tool
s/wineapploader.in
View file @
718ea42f
File moved
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