ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We no longer need to link against ntdll in the Unix sense.

This commit is contained in:
Alexandre Julliard 2003-10-11 01:00:35 +00:00
parent 08a64e6e6a
commit e8dae9c029
4 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -105,14 +105,14 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
all: $(SUBDIRS) all: $(SUBDIRS)
dlls: libs tools dlls: libs tools
server: libs tools miscemu server: libs tools
miscemu programs: dlls libs tools programs: dlls libs tools
tools: libs tools: libs
dlls/__install-lib__ dlls/__install-dev__: libs tools dlls/__install-lib__ dlls/__install-dev__: libs tools
libs/__install-lib__ libs/__install-dev__: libs libs/__install-lib__ libs/__install-dev__: libs
server/__install__: libs tools miscemu/__install__ server/__install__: libs tools
miscemu/__install__ programs/__install__: libs tools dlls/__install-lib__ programs/__install__: libs tools dlls/__install-lib__
tools/__install__: tools tools/__install__: tools
# Test rules # Test rules

22
dlls/Makefile.in
View File

@ -1525,26 +1525,6 @@ wow32/wow32.dll$(DLLEXT): wow32
winsock/ws2_32.dll$(DLLEXT): winsock winsock/ws2_32.dll$(DLLEXT): winsock
wsock32/wsock32.dll$(DLLEXT): wsock32 wsock32/wsock32.dll$(DLLEXT): wsock32
x11drv/x11drv.dll$(DLLEXT): x11drv x11drv/x11drv.dll$(DLLEXT): x11drv
# Special targets for dlls that we need to link to
libntdll.dll.$(LIBEXT): ntdll/ntdll.dll$(DLLEXT)
$(RM) $@ && $(LN_S) ntdll/ntdll.dll$(DLLEXT) $@
all: libntdll.dll.$(LIBEXT)
uninstall::
$(RM) $(libdir)/libntdll.dll.$(LIBEXT)
install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
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
# Rules for auto documentation # Rules for auto documentation
$(SUBDIRS:%=%/__man__): dummy $(SUBDIRS:%=%/__man__): dummy
@ -1570,6 +1550,8 @@ install install-dev:: $(IMPORT_LIBS:%=%.$(IMPLIBEXT))
$(MKINSTALLDIRS) $(dlldir) $(MKINSTALLDIRS) $(dlldir)
for f in $(IMPORT_LIBS:%=%.$(IMPLIBEXT)); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done for f in $(IMPORT_LIBS:%=%.$(IMPLIBEXT)); do $(INSTALL_DATA) $$f $(dlldir)/$$f; done
install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
uninstall:: uninstall::
$(RM) $(IMPORT_LIBS:%=$(dlldir)/%.$(IMPLIBEXT)) $(RM) $(IMPORT_LIBS:%=$(dlldir)/%.$(IMPLIBEXT))
-rmdir $(dlldir) -rmdir $(dlldir)

28
dlls/make_dlls
View File

@ -256,32 +256,6 @@ foreach my $mod (sort keys %directories)
printf NEWMAKE "%s/%s\$(DLLEXT): %s\n", $directories{$mod}, $mod, $directories{$mod}; printf NEWMAKE "%s/%s\$(DLLEXT): %s\n", $directories{$mod}, $mod, $directories{$mod};
} }
################################################################
# output the linkable dlls special links
print NEWMAKE <<EOF;
\# Special targets for dlls that we need to link to
libntdll.dll.\$(LIBEXT): ntdll/ntdll.dll\$(DLLEXT)
\$(RM) \$@ && \$(LN_S) ntdll/ntdll.dll\$(DLLEXT) \$@
all: libntdll.dll.\$(LIBEXT)
uninstall::
\$(RM) \$(libdir)/libntdll.dll.\$(LIBEXT)
install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
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
################################################################ ################################################################
# makefile trailer # makefile trailer
@ -311,6 +285,8 @@ install install-dev:: \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT))
\$(MKINSTALLDIRS) \$(dlldir) \$(MKINSTALLDIRS) \$(dlldir)
for f in \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT)); do \$(INSTALL_DATA) \$\$f \$(dlldir)/\$\$f; done for f in \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT)); do \$(INSTALL_DATA) \$\$f \$(dlldir)/\$\$f; done
install install-lib:: \$(INSTALLSUBDIRS:%=%/__install__)
uninstall:: uninstall::
\$(RM) \$(IMPORT_LIBS:%=\$(dlldir)/%.\$(IMPLIBEXT)) \$(RM) \$(IMPORT_LIBS:%=\$(dlldir)/%.\$(IMPLIBEXT))
-rmdir \$(dlldir) -rmdir \$(dlldir)

4
tools/winewrapper
View File

@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd`
if [ -n "$LD_LIBRARY_PATH" ] if [ -n "$LD_LIBRARY_PATH" ]
then then
LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs:$LD_LIBRARY_PATH" LD_LIBRARY_PATH="$topdir/libs:$LD_LIBRARY_PATH"
else else
LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs" LD_LIBRARY_PATH="$topdir/libs"
fi fi
WINEDLLPATH="$topdir/dlls:$topdir/programs" WINEDLLPATH="$topdir/dlls:$topdir/programs"
WINESERVER="$topdir/server/wineserver" WINESERVER="$topdir/server/wineserver"