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
65c6ca59
Commit
65c6ca59
authored
Feb 25, 2009
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
programs: Get rid of the remaining binary wrappers, they break out-of-tree builds.
parent
0e4b0b9f
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1 addition
and
45 deletions
+1
-45
.gitignore
.gitignore
+0
-11
configure
configure
+0
-12
configure.ac
configure.ac
+0
-10
Makefile.in
programs/Makefile.in
+1
-8
make_makefiles
tools/make_makefiles
+0
-4
No files found.
.gitignore
View file @
65c6ca59
...
...
@@ -226,10 +226,6 @@ loader/wine.de.man
loader/wine.fr.man
loader/wine.man
programs/Makeprog.rules
programs/msiexec/msiexec
programs/notepad/notepad
programs/regedit/regedit
programs/regsvr32/regsvr32
programs/rpcss/epm.h
programs/rpcss/epm_s.c
programs/rpcss/irot.h
...
...
@@ -237,17 +233,10 @@ programs/rpcss/irot_s.c
programs/services/svcctl.h
programs/services/svcctl_s.c
programs/wineapploader
programs/wineboot/wineboot
programs/winecfg/winecfg
programs/wineconsole/wineconsole
programs/winedbg/dbg.tab.c
programs/winedbg/dbg.tab.h
programs/winedbg/debug.yy.c
programs/winedbg/winedbg
programs/winedbg/winedbg.man
programs/winefile/winefile
programs/winemine/winemine
programs/winepath/winepath
programs/winetest/*_test.exe
programs/winetest/tests.rc
programs/winhlp32/macro.lex.yy.c
...
...
configure
View file @
65c6ca59
...
...
@@ -639,7 +639,6 @@ ac_includes_default="\
ac_subst_vars
=
'LTLIBOBJS
LIBOBJS
ALL_PROGRAM_BIN_WRAPPERS
ALL_WINETEST_DEPENDS
ALL_PROGRAM_BIN_INSTALL_DIRS
ALL_PROGRAM_INSTALL_DIRS
...
...
@@ -28000,17 +27999,6 @@ done
test
-n
"
$DLLEXT
"
||
ALL_PROGRAM_BIN_INSTALL_DIRS
=
""
ALL_PROGRAM_BIN_WRAPPERS
=
""
for
dir
in
$ALL_PROGRAM_BIN_INSTALL_DIRS
do
if
test
"
$dir
"
!=
"
\\
"
then
ALL_PROGRAM_BIN_WRAPPERS
=
"
$ALL_PROGRAM_BIN_WRAPPERS
\\
$dir
/
$dir
"
fi
done
cat
>
confcache
<<
\
_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
...
...
configure.ac
View file @
65c6ca59
...
...
@@ -2336,16 +2336,6 @@ done
dnl Don't install in bin dir for Windows build
test -n "$DLLEXT" || ALL_PROGRAM_BIN_INSTALL_DIRS=""
AC_SUBST(ALL_PROGRAM_BIN_WRAPPERS,"")
for dir in $ALL_PROGRAM_BIN_INSTALL_DIRS
do
if test "$dir" != "\\"
then
ALL_PROGRAM_BIN_WRAPPERS="$ALL_PROGRAM_BIN_WRAPPERS \\
$dir/$dir"
fi
done
AC_OUTPUT
if test "$no_create" = "yes"
...
...
programs/Makefile.in
View file @
65c6ca59
...
...
@@ -6,7 +6,6 @@ VPATH = @srcdir@
SUBDIRS
=
@ALL_PROGRAM_DIRS@
INSTALLSUBDIRS
=
@ALL_PROGRAM_INSTALL_DIRS@
INSTALLPROGS
=
@ALL_PROGRAM_BIN_INSTALL_DIRS@
BIN_WRAPPERS
=
@ALL_PROGRAM_BIN_WRAPPERS@
INSTALLDIRS
=
$(DESTDIR)$(bindir)
...
...
@@ -14,14 +13,11 @@ PROGRAMS = wineapploader
@MAKE_RULES@
all
:
$(PROGRAMS) $(SUBDIRS)
$(BIN_WRAPPERS)
all
:
$(PROGRAMS) $(SUBDIRS)
wineapploader
:
wineapploader.in
sed
-e
's,@bindir\@,
$(bindir)
,g'
$(SRCDIR)
/wineapploader.in
>
$@
||
(
$(RM)
$@
&&
false
)
$(BIN_WRAPPERS)
:
$(WINEWRAPPER)
$(RM)
$@
&&
$(LN)
$(WINEWRAPPER)
$@
# Rules for installation
.PHONY
:
install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__)
...
...
@@ -43,9 +39,6 @@ uninstall::
-
cd
$(DESTDIR)$(bindir)
&&
$(RM)
wineapploader
$(INSTALLPROGS)
-
rmdir
$(DESTDIR)$(dlldir)
clean
::
$(RM)
$(BIN_WRAPPERS)
# Rules for testing
check test
::
$(SUBDIRS:%=%/__test__)
tools/make_makefiles
View file @
65c6ca59
...
...
@@ -541,10 +541,6 @@ sub update_gitignore(@)
{
push
@ignores
,
map
{
s/\$\(EXEEXT\)//
;
$dir
.
$_
;
}
@
{
$makefile
{
"PROGRAMS"
}};
}
if
(
$dir
=~
/^programs\/(.*)\/$/
)
{
push
@ignores
,
"$dir$1"
if
$bin_install
{
$1
};
}
}
# prepend a slash to paths that don't have one
...
...
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