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
313661d1
Commit
313661d1
authored
Oct 10, 2003
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
LDIMPORTS is no longer needed.
parent
7196724a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
48 deletions
+19
-48
Makedll.rules.in
dlls/Makedll.rules.in
+2
-2
Makefile.in
dlls/Makefile.in
+4
-6
make_dlls
dlls/make_dlls
+13
-40
No files found.
dlls/Makedll.rules.in
View file @
313661d1
...
...
@@ -29,7 +29,7 @@ $(MAINSPEC).c: $(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(IMPORTLIBS) $(WIN
$(WINEBUILD) $(DEFS) $(DLLFLAGS) -o $@ --spec $(SRCDIR)/$(MAINSPEC) $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(DLLMAIN:%=--entry %) -L$(DLLDIR) $(DELAYIMPORTS:%=-d%) $(IMPORTS:%=-l%)
$(MODULE).so: $(MAINSPEC).o $(ALL_OBJS) Makefile.in
$(LDSHARED) $(LDDLLFLAGS) $(MAINSPEC).o $(ALL_OBJS) -o $@
-L$(DLLDIR) $(LDIMPORTS:%=-l%)
$(ALL_LIBS) -lc
$(LDSHARED) $(LDDLLFLAGS) $(MAINSPEC).o $(ALL_OBJS) -o $@ $(ALL_LIBS) -lc
$(MODULE).tmp.o: $(ALL_OBJS) Makefile.in
$(LDCOMBINE) $(ALL_OBJS) -o $@
...
...
@@ -51,7 +51,7 @@ CHECKLINK_RPATH = dlls libs/unicode libs/wine
$(WIN16_FILES:%=__checklink16__%): checklink16
checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy
$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o
-L$(DLLDIR) $(LDIMPORTS:%=-l%)
$(ALL_LIBS) && $(RM) checklink
$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/dlls/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o $(ALL_LIBS) && $(RM) checklink
checklink:: $(WIN16_FILES:%=__checklink16__%)
...
...
dlls/Makefile.in
View file @
313661d1
...
...
@@ -1528,19 +1528,17 @@ x11drv/x11drv.dll$(DLLEXT): x11drv
# Special targets for dlls that we need to link to
LINKABLE_DLLS
=
ntdll.dll
libntdll.dll.$(LIBEXT)
:
ntdll/ntdll.dll$(DLLEXT)
$(RM)
$@
&&
$(LN_S)
ntdll/ntdll.dll
$(DLLEXT)
$@
kernel kernel/__install__
:
libntdll.dll.$(LIBEXT)
all
:
libntdll.dll.$(LIBEXT)
uninstall
::
$(RM)
$
(
LINKABLE_DLLS:%
=
$(libdir)
/lib%.
$(LIBEXT)
)
$(RM)
$(
libdir)
/libntdll.dll.
$(LIBEXT
)
install install-lib
::
$(INSTALLSUBDIRS:%=%/__install__)
$(RM)
$
(
LINKABLE_DLLS:%
=
$(libdir)
/lib%.
$(LIBEXT)
)
cd
$(libdir)
&&
if
[
"
$(dlldir)
"
=
"
$(libdir)
/wine"
]
;
\
cd
$(libdir)
&&
$(RM)
libntdll.dll.
$(LIBEXT)
&&
\
if
[
"
$(dlldir)
"
=
"
$(libdir)
/wine"
]
;
\
then
\
$(LN_S)
wine/ntdll.dll
$(DLLEXT)
libntdll.dll.
$(LIBEXT)
;
\
else
\
...
...
dlls/make_dlls
View file @
313661d1
...
...
@@ -27,7 +27,6 @@ my $makefiles = `find . -name Makefile.in -print`;
my
%
imports
=
();
my
%
directories
=
();
my
%
altnames
=
();
my
%
linked_dlls
=
();
# list of special dlls that can be switched on or off by configure
my
%
special_dlls
=
...
...
@@ -76,12 +75,6 @@ foreach my $i (split(/\s/,$makefiles))
push
@
{
$imports
{
$module
}},
@list
;
next
;
}
if
(
/^LDIMPORTS\s*=\s*(.*)/
)
{
my
@list
=
map
{
/\./
?
$_
:
$_
.
".dll"
;
}
split
(
/\s/
,
$1
);
$linked_dlls
{
$module
}
=
\
@list
;
next
;
}
}
close
MAKE
;
push
@
{
$imports
{
$module
}},
"kernel32.dll"
unless
!
defined
(
$module
)
||
@
{
$imports
{
$module
}}
||
$module
eq
"ntdll.dll"
;
...
...
@@ -266,48 +259,28 @@ foreach my $mod (sort keys %directories)
################################################################
# output the linkable dlls special links
my
%
linkable_dlls
=
();
foreach
my
$mod
(
keys
%
imports
)
{
foreach
my
$i
(
@
{
$linked_dlls
{
$mod
}})
{
$linkable_dlls
{
$i
}
=
1
;
}
}
print
NEWMAKE
"\n# Special targets for dlls that we need to link to\n\n"
;
printf
NEWMAKE
"LINKABLE_DLLS = %s\n\n"
,
join
(
" "
,
keys
%
linkable_dlls
);
print
NEWMAKE
<<EOF;
foreach
my
$mod
(
keys
%
linkable_dlls
)
{
printf
NEWMAKE
"lib%s.\$(LIBEXT): %s/%s\$(DLLEXT)\n"
,
$mod
,
$directories
{
$mod
},
$mod
;
printf
NEWMAKE
"\t\$(RM) \$@ && \$(LN_S) %s/%s\$(DLLEXT) \$@\n\n"
,
$directories
{
$mod
},
$mod
;
}
\# Special targets for dlls that we need to link to
foreach
my
$mod
(
keys
%
imports
)
{
my
$deps
=
""
;
foreach
my
$i
(
@
{
$linked_dlls
{
$mod
}})
{
$deps
.=
" lib$i.\$(LIBEXT)"
;
}
if
(
$deps
)
{
printf
NEWMAKE
"%s %s/__install__:%s\n"
,
$directories
{
$mod
},
$directories
{
$mod
},
$deps
;
}
}
libntdll.dll.\$(LIBEXT): ntdll/ntdll.dll\$(DLLEXT)
\$(RM) \$@ && \$(LN_S) ntdll/ntdll.dll\$(DLLEXT) \$@
print
NEWMAKE
<<EOF;
all: libntdll.dll.\$(LIBEXT)
uninstall::
\$(RM) \$(
LINKABLE_DLLS:%=\$(libdir)/lib%.\$(LIBEXT)
)
\$(RM) \$(
libdir)/libntdll.dll.\$(LIBEXT
)
install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
\$(RM) \$(LINKABLE_DLLS:%=\$(libdir)/lib%.\$(LIBEXT))
cd \$(libdir) &&
if [ "\$(dlldir)" = "\$(libdir)/wine" ]; \\
cd \$(libdir) && \$(RM) libntdll.dll.\$(LIBEXT) && \\
if [ "\$(dlldir)" = "\$(libdir)/wine" ]; \\
then \\
\$(LN_S) wine/ntdll.dll\$(DLLEXT) libntdll.dll.\$(LIBEXT); \\
else \\
\$(LN_S) \$(dlldir)/ntdll.dll\$(DLLEXT) libntdll.dll.\$(LIBEXT); \\
fi
EOF
foreach
my
$mod
(
keys
%
linkable_dlls
)
{
printf
NEWMAKE
"\t \$(LN_S) wine/%s\$(DLLEXT) lib%s.\$(LIBEXT); \\\n"
,
$mod
,
$mod
;
}
print
NEWMAKE
"\telse \\\n"
;
foreach
my
$mod
(
keys
%
linkable_dlls
)
{
printf
NEWMAKE
"\t \$(LN_S) \$(dlldir)/%s\$(DLLEXT) lib%s.\$(LIBEXT); \\\n"
,
$mod
,
$mod
;
}
print
NEWMAKE
"\tfi\n\n"
;
################################################################
# makefile trailer
...
...
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