diff --git a/Make.rules.in b/Make.rules.in index d2ed28adb84..9cf27ec259e 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -71,9 +71,9 @@ WRCFLAGS = -m --nostdinc $(EXTRAWRCFLAGS) LDPATH = @LDPATH@ DLLDIR = $(TOPOBJDIR)/dlls LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port -LIBWINE = -L$(TOPOBJDIR)/library -lwine LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode LIBUUID = -L$(TOPOBJDIR)/libs/uuid -lwine_uuid +LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine @SET_MAKE@ @@ -235,10 +235,16 @@ clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) # Rules for installing -$(INSTALLSUBDIRS:%=%/__install__): dummy +$(SUBDIRS:%=%/__install__): dummy cd `dirname $@` && $(MAKE) install -$(INSTALLSUBDIRS:%=%/__uninstall__): dummy +$(SUBDIRS:%=%/__install-lib__): dummy + cd `dirname $@` && $(MAKE) install-lib + +$(SUBDIRS:%=%/__install-dev__): dummy + cd `dirname $@` && $(MAKE) install-dev + +$(SUBDIRS:%=%/__uninstall__): dummy cd `dirname $@` && $(MAKE) uninstall install:: $(INSTALLSUBDIRS:%=%/__install__) @@ -246,7 +252,8 @@ install:: $(INSTALLSUBDIRS:%=%/__install__) uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__) .PHONY: install install-lib install-dev uninstall \ - $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__) + $(SUBDIRS:%=%/__install__) $(SUBDIRS:%=%/__uninstall__) \ + $(SUBDIRS:%=%/__install-lib__) $(SUBDIRS:%=%/__install-dev__) # Rules for checking that no imports are missing diff --git a/Makefile.in b/Makefile.in index 3c286b70120..e7e54f94604 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,7 +31,6 @@ SUBDIRS = \ dlls \ documentation \ include \ - library \ libs \ miscemu \ programs \ @@ -41,7 +40,6 @@ SUBDIRS = \ # Sub-directories to install for install-lib INSTALLLIBSUBDIRS = \ documentation \ - library \ miscemu \ programs \ server @@ -101,36 +99,25 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__) $(RM) $(datadir)/aclocal/wine.m4 -rmdir $(datadir)/aclocal -$(INSTALLBOTHSUBDIRS:%=%/__install-lib__): dummy - cd `dirname $@` && $(MAKE) install-lib - -$(INSTALLBOTHSUBDIRS:%=%/__install-dev__): dummy - cd `dirname $@` && $(MAKE) install-dev - -$(INSTALLBOTHSUBDIRS:%=%/__uninstall__): dummy - cd `dirname $@` && $(MAKE) uninstall - -.PHONY: install-aclocal $(INSTALLBOTHSUBDIRS:%=%/__install-lib__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) $(INSTALLBOTHSUBDIRS:%=%/__uninstall__) +.PHONY: install-aclocal # Dependencies between directories all: $(SUBDIRS) -dlls: library libs tools -server: library libs tools -miscemu programs: dlls library libs tools -tools: library libs +dlls: libs tools +server: libs tools +miscemu programs: dlls libs tools +tools: libs -dlls/__install-lib__ dlls/__install-dev__: library libs tools -server/__install__: library libs tools -miscemu/__install__ programs/__install__: library libs tools dlls/__install-lib__ -library/__install__: library -libs/__install__: libs +dlls/__install-lib__ dlls/__install-dev__: libs tools +libs/__install-lib__ libs/__install-dev__: libs +server/__install__: libs tools +miscemu/__install__ programs/__install__: libs tools dlls/__install-lib__ tools/__install__: tools # Test rules checklink:: $(TESTSUBDIRS:%=%/__checklink__) - $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c && $(RM) checklink check test:: wine $(TESTSUBDIRS:%=%/__test__) diff --git a/configure b/configure index 6bd305b8f39..7f2674ff948 100755 --- a/configure +++ b/configure @@ -15683,7 +15683,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmusic/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmusic/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/msvideo/msrle32/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/winejack/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile libs/wine/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -16341,11 +16341,11 @@ do "dlls/x11drv/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/x11drv/Makefile" ;; "documentation/Makefile" ) CONFIG_FILES="$CONFIG_FILES documentation/Makefile" ;; "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "library/Makefile" ) CONFIG_FILES="$CONFIG_FILES library/Makefile" ;; "libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/Makefile" ;; "libs/port/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/port/Makefile" ;; "libs/unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/unicode/Makefile" ;; "libs/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/uuid/Makefile" ;; + "libs/wine/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/wine/Makefile" ;; "miscemu/Makefile" ) CONFIG_FILES="$CONFIG_FILES miscemu/Makefile" ;; "programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; "programs/avitools/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/avitools/Makefile" ;; diff --git a/configure.ac b/configure.ac index 90936510b2a..cd3a8431e3d 100644 --- a/configure.ac +++ b/configure.ac @@ -1513,11 +1513,11 @@ dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile -library/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/uuid/Makefile +libs/wine/Makefile miscemu/Makefile programs/Makefile programs/avitools/Makefile diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 192ccd43cd7..8a95189f7d8 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -49,14 +49,14 @@ $(SPEC_DEF): $(WINEBUILD) # Rules for checking that no imports are missing -CHECKLINK_RPATH = dlls library libs/unicode +CHECKLINK_RPATH = dlls libs/unicode libs/wine .PHONY: checklink16 $(WIN16_FILES:%=__checklink16__%) $(WIN16_FILES:%=__checklink16__%): checklink16 checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy - $(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/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 -L$(DLLDIR) $(LDIMPORTS:%=-l%) $(ALL_LIBS) && $(RM) checklink checklink:: $(WIN16_FILES:%=__checklink16__%) diff --git a/library/checklink.c b/dlls/checklink.c similarity index 100% rename from library/checklink.c rename to dlls/checklink.c diff --git a/library/.cvsignore b/library/.cvsignore deleted file mode 100644 index da188e828ef..00000000000 --- a/library/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -libwine.dll -libwine.so.1.0 diff --git a/library/port.c b/library/port.c deleted file mode 100644 index 7da0c95abfd..00000000000 --- a/library/port.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Misc. functions for systems that don't have them - * - * Copyright 1996 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "config.h" -#include "wine/port.h" - -#ifdef __BEOS__ -#include -#include -#endif - -#include -#include -#include -#include -#include -#include -#ifdef HAVE_UNISTD_H -# include -#endif -#include -#ifdef HAVE_SYS_INTTYPES_H -# include -#endif -#ifdef HAVE_SYS_TIME_h -# include -#endif -#include -#ifdef HAVE_SYS_IOCTL_H -#include -#endif -#include -#include -#ifdef HAVE_TERMIOS_H -#include -#endif -#ifdef HAVE_SYS_MMAN_H -#include -#endif -#ifdef HAVE_LIBIO_H -# include -#endif -#ifdef HAVE_SYSCALL_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif - - -/*********************************************************************** - * pthread functions - */ - -#ifndef HAVE_PTHREAD_GETSPECIFIC -void pthread_getspecific() { assert(0); } -#endif - -#ifndef HAVE_PTHREAD_KEY_CREATE -void pthread_key_create() { assert(0); } -#endif - -#ifndef HAVE_PTHREAD_MUTEX_LOCK -void pthread_mutex_lock() { assert(0); } -#endif - -#ifndef HAVE_PTHREAD_MUTEX_UNLOCK -void pthread_mutex_unlock() { assert(0); } -#endif - -#ifndef HAVE_PTHREAD_SETSPECIFIC -void pthread_setspecific() { assert(0); } -#endif diff --git a/libs/Makefile.in b/libs/Makefile.in index bf4a4600399..16c30ea68dc 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -7,21 +7,23 @@ MODULE = none SUBDIRS = \ port \ unicode \ - uuid + uuid \ + wine -# Sub-directories to install for install-lib -INSTALLLIBSUBDIRS = unicode - -# Sub-directories to install for install-dev -INSTALLDEVSUBDIRS = uuid - -INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS) +INSTALLSUBDIRS = \ + unicode \ + uuid \ + wine @MAKE_RULES@ all: $(SUBDIRS) -install-lib:: $(INSTALLLIBSUBDIRS:%=%/__install__) -install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) +install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__) +install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) + +# Inter-dll dependencies + +wine wine/__install__ wine/__install-lib__: port ### Dependencies: diff --git a/libs/unicode/Makefile.in b/libs/unicode/Makefile.in index 289668fcdff..4e1bc0455af 100644 --- a/libs/unicode/Makefile.in +++ b/libs/unicode/Makefile.in @@ -1,12 +1,12 @@ -DEFS = @DLLFLAGS@ -D__WINESRC__ +DEFS = @DLLFLAGS@ -D__WINESRC__ -DNO_LIBWINE_PORT TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ -MODULE = none SOVERSION = 1 SONAME = libwine_unicode.so.$(SOVERSION) +MODULE = libwine_unicode.$(LIBEXT) CODEPAGES = \ 037 \ @@ -81,40 +81,42 @@ C_SRCS = \ wctype.c \ $(CODEPAGES:%=c_%.c) -all: libwine_unicode.$(LIBEXT) +all: $(MODULE) @MAKE_RULES@ -libwine_unicode.so.$(SOVERSION): $(OBJS) +libwine_unicode.so.$(SOVERSION): $(OBJS) Makefile.in $(LDSHARED) $(OBJS) -o $@ libwine_unicode.so: libwine_unicode.so.$(SOVERSION) $(RM) $@ && $(LN_S) libwine_unicode.so.$(SOVERSION) $@ -libwine_unicode.a: $(OBJS) - $(RM) $@ - $(AR) $@ $(OBJS) - $(RANLIB) $@ +libwine_unicode.a: wine_unicode.def + $(DLLTOOL) -l $@ -d $(SRCDIR)/wine_unicode.def -libwine_unicode.dll: $(OBJS) wine_unicode.def - $(DLLWRAP) --def $(SRCDIR)/wine_unicode.def --implib libwine_unicode.a -o libwine_unicode.dll $(OBJS) +libwine_unicode.dll: $(OBJS) wine_unicode.def Makefile.in + $(DLLWRAP) --def $(SRCDIR)/wine_unicode.def -o $@ $(OBJS) -.PHONY: install_so install_a install_dll +.PHONY: install-lib-so install-lib-dll install-dev-so install-dev-dll -install_so: libwine_unicode.so.$(SOVERSION) dummy +install-lib-so: libwine_unicode.so.$(SOVERSION) dummy $(MKINSTALLDIRS) $(libdir) $(INSTALL_PROGRAM) libwine_unicode.so.$(SOVERSION) $(libdir)/libwine_unicode.so.$(SOVERSION) - cd $(libdir) && $(RM) libwine_unicode.so && $(LN_S) libwine_unicode.so.$(SOVERSION) libwine_unicode.so -install_a: libwine_unicode.a dummy - $(MKINSTALLDIRS) $(libdir) - $(INSTALL_DATA) libwine_unicode.a $(libdir)/libwine_unicode.a - -install_dll: libwine_unicode.dll dummy +install-lib-dll: libwine_unicode.dll dummy $(MKINSTALLDIRS) $(libdir) $(INSTALL_DATA) libwine_unicode.dll $(libdir)/libwine_unicode.dll -install:: $(LIBEXT:%=install_%) +install-dev-so: dummy + $(MKINSTALLDIRS) $(libdir) + cd $(libdir) && $(RM) libwine_unicode.so && $(LN_S) libwine_unicode.so.$(SOVERSION) libwine_unicode.so + +install-dev-dll: libwine_unicode.a dummy + $(MKINSTALLDIRS) $(libdir) + $(INSTALL_DATA) libwine_unicode.a $(libdir)/libwine_unicode.a + +install install-lib:: $(LIBEXT:%=install-lib-%) +install install-dev:: $(LIBEXT:%=install-dev-%) uninstall:: $(RM) $(libdir)/libwine_unicode.a $(libdir)/libwine_unicode.dll $(libdir)/libwine_unicode.so $(libdir)/libwine_unicode.so.$(SOVERSION) diff --git a/libs/uuid/Makefile.in b/libs/uuid/Makefile.in index befd9036893..0aa4456f872 100644 --- a/libs/uuid/Makefile.in +++ b/libs/uuid/Makefile.in @@ -14,12 +14,12 @@ all: $(MODULE) @MAKE_RULES@ -$(MODULE): $(OBJS) +$(MODULE): $(OBJS) Makefile.in $(RM) $@ $(AR) $@ $(OBJS) $(RANLIB) $@ -install:: libwine_uuid.a +install install-dev:: libwine_uuid.a $(MKINSTALLDIRS) $(libdir) $(INSTALL_DATA) libwine_uuid.a $(libdir)/libwine_uuid.a diff --git a/libs/wine/.cvsignore b/libs/wine/.cvsignore new file mode 100644 index 00000000000..4fad6a1b665 --- /dev/null +++ b/libs/wine/.cvsignore @@ -0,0 +1,2 @@ +Makefile +libwine.so.1 diff --git a/library/Makefile.in b/libs/wine/Makefile.in similarity index 60% rename from library/Makefile.in rename to libs/wine/Makefile.in index 2bc600580e2..cd82d621cf6 100644 --- a/library/Makefile.in +++ b/libs/wine/Makefile.in @@ -1,61 +1,59 @@ DEFS = @DLLFLAGS@ -D__WINESRC__ -DDLLDIR="\"$(dlldir)\"" TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. +TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ -MODULE = none -SOVERSION = 1.0 -SONAME = libwine.so -EXTRALIBS = @DLLIBS@ @CRTLIBS@ +SOVERSION = 1 +SONAME = libwine.so.$(SOVERSION) +MODULE = libwine.$(LIBEXT) +EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@ C_SRCS = \ config.c \ debug.c \ errno.c \ ldt.c \ - loader.c \ - port.c + loader.c all: libwine.$(LIBEXT) @MAKE_RULES@ -libwine.so.$(SOVERSION): $(OBJS) +libwine.so.$(SOVERSION): $(OBJS) Makefile.in $(LDSHARED) $(OBJS) $(EXTRALIBS) $(LIBS) -o $@ libwine.so: libwine.so.$(SOVERSION) $(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@ -libwine.a: $(OBJS) - $(RM) $@ - $(AR) $@ $(OBJS) - $(RANLIB) $@ - -libwine.dll: $(OBJS) +libwine.dll libwine.a: $(OBJS) Makefile.in $(DLLWRAP) --export-all --implib libwine.a -o libwine.dll $(OBJS) $(EXTRALIBS) -.PHONY: install_so install_a install_dll +.PHONY: install-lib-so install-lib-dll install-dev-so install-dev-dll -install_so: libwine.so.$(SOVERSION) dummy +install-lib-so: libwine.so.$(SOVERSION) dummy $(MKINSTALLDIRS) $(libdir) $(INSTALL_PROGRAM) libwine.so.$(SOVERSION) $(libdir)/libwine.so.$(SOVERSION) - cd $(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(SOVERSION) libwine.so -install_a: libwine.a dummy - $(MKINSTALLDIRS) $(libdir) - $(INSTALL_DATA) libwine.a $(libdir)/libwine.a - -install_dll: libwine.dll dummy +install-lib-dll: libwine.dll dummy $(MKINSTALLDIRS) $(libdir) $(INSTALL_DATA) libwine.dll $(libdir)/libwine.dll -install:: $(LIBEXT:%=install_%) +install-dev-so: dummy + $(MKINSTALLDIRS) $(libdir) + cd $(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(SOVERSION) libwine.so + +install-dev-dll: libwine.a dummy + $(MKINSTALLDIRS) $(libdir) + $(INSTALL_DATA) libwine.a $(libdir)/libwine.a + +install install-lib:: $(LIBEXT:%=install-lib-%) +install install-dev:: $(LIBEXT:%=install-dev-%) uninstall:: $(RM) $(libdir)/libwine.a $(libdir)/libwine.dll $(libdir)/libwine.so $(libdir)/libwine.so.$(SOVERSION) clean:: - $(RM) libwine.so.$(SOVERSION) + $(RM) libwine.so.$(SOVERSION) libwine.dll ### Dependencies: diff --git a/library/config.c b/libs/wine/config.c similarity index 100% rename from library/config.c rename to libs/wine/config.c diff --git a/library/debug.c b/libs/wine/debug.c similarity index 100% rename from library/debug.c rename to libs/wine/debug.c diff --git a/library/errno.c b/libs/wine/errno.c similarity index 76% rename from library/errno.c rename to libs/wine/errno.c index bd67b97ea51..f0b950d7ee0 100644 --- a/library/errno.c +++ b/libs/wine/errno.c @@ -20,6 +20,8 @@ #include "config.h" +#include + /* default errno before threading is initialized */ static int *default_errno_location(void) { @@ -58,3 +60,26 @@ int *__h_errno_location(void) { return wine_h_errno_location(); } + +/*********************************************************************** + * pthread functions + */ +#ifndef HAVE_PTHREAD_GETSPECIFIC +void pthread_getspecific() { assert(0); } +#endif + +#ifndef HAVE_PTHREAD_KEY_CREATE +void pthread_key_create() { assert(0); } +#endif + +#ifndef HAVE_PTHREAD_MUTEX_LOCK +void pthread_mutex_lock() { assert(0); } +#endif + +#ifndef HAVE_PTHREAD_MUTEX_UNLOCK +void pthread_mutex_unlock() { assert(0); } +#endif + +#ifndef HAVE_PTHREAD_SETSPECIFIC +void pthread_setspecific() { assert(0); } +#endif diff --git a/library/ldt.c b/libs/wine/ldt.c similarity index 100% rename from library/ldt.c rename to libs/wine/ldt.c diff --git a/library/loader.c b/libs/wine/loader.c similarity index 100% rename from library/loader.c rename to libs/wine/loader.c diff --git a/tools/winewrapper b/tools/winewrapper index e143692381e..8cda5b22016 100755 --- a/tools/winewrapper +++ b/tools/winewrapper @@ -64,9 +64,9 @@ topdir=`cd "$topdir" && pwd` if [ -n "$LD_LIBRARY_PATH" ] then - LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/libs/unicode:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs/wine:$topdir/libs/unicode:$LD_LIBRARY_PATH" else - LD_LIBRARY_PATH="$topdir/dlls:$topdir/library:$topdir/libs/unicode" + LD_LIBRARY_PATH="$topdir/dlls:$topdir/libs/wine:$topdir/libs/unicode" fi WINEDLLPATH="$topdir/dlls:$topdir/programs" WINESERVER="$topdir/server/wineserver"