diff --git a/Make.rules.in b/Make.rules.in index 484f33ac57f..59ad06c0245 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -73,7 +73,7 @@ DLLDIR = $(TOPOBJDIR)/dlls LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port LIBWINE = -L$(TOPOBJDIR)/library -lwine LIBUNICODE = -L$(TOPOBJDIR)/unicode -lwine_unicode -LIBUUID = -L$(TOPOBJDIR)/ole -lwine_uuid +LIBUUID = -L$(TOPOBJDIR)/libs/uuid -lwine_uuid @SET_MAKE@ diff --git a/Makefile.in b/Makefile.in index 27b8d15944b..b68641b9add 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,7 +34,6 @@ SUBDIRS = \ library \ libs \ miscemu \ - ole \ programs \ server \ tools \ @@ -50,10 +49,7 @@ INSTALLLIBSUBDIRS = \ unicode # Sub-directories to install for install-dev -INSTALLDEVSUBDIRS = \ - include \ - ole \ - tools +INSTALLDEVSUBDIRS = include tools # Sub-directories to install for both install-lib and install-dev INSTALLBOTHSUBDIRS = dlls libs @@ -121,17 +117,16 @@ $(INSTALLBOTHSUBDIRS:%=%/__uninstall__): dummy # Dependencies between directories all: $(SUBDIRS) -dlls: library libs ole tools unicode +dlls: library libs tools unicode server: library libs tools unicode -miscemu programs: dlls library libs ole tools unicode +miscemu programs: dlls library libs tools unicode tools: library libs unicode -dlls/__install-lib__ dlls/__install-dev__: library libs ole tools unicode +dlls/__install-lib__ dlls/__install-dev__: library libs tools unicode server/__install__: library libs tools unicode -miscemu/__install__ programs/__install__: library libs ole tools unicode dlls/__install-lib__ +miscemu/__install__ programs/__install__: library libs tools unicode dlls/__install-lib__ library/__install__: library libs/__install__: libs -ole/__install__: ole tools/__install__: tools unicode/__install__: unicode diff --git a/configure b/configure index 01430cae15a..801c815b13e 100755 --- a/configure +++ b/configure @@ -15666,6 +15666,8 @@ esac ac_config_commands="$ac_config_commands objects" + ac_config_commands="$ac_config_commands ole" + ac_config_commands="$ac_config_commands programs/regapi/tests" ac_config_commands="$ac_config_commands programs/regedit/tests" @@ -15691,7 +15693,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/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 miscemu/Makefile ole/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 unicode/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/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/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 unicode/Makefile" cat >confcache <<\_ACEOF @@ -16351,8 +16353,8 @@ do "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/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES libs/uuid/Makefile" ;; "miscemu/Makefile" ) CONFIG_FILES="$CONFIG_FILES miscemu/Makefile" ;; - "ole/Makefile" ) CONFIG_FILES="$CONFIG_FILES ole/Makefile" ;; "programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; "programs/avitools/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/avitools/Makefile" ;; "programs/clock/Makefile" ) CONFIG_FILES="$CONFIG_FILES programs/clock/Makefile" ;; @@ -16417,6 +16419,7 @@ do "misc" ) CONFIG_COMMANDS="$CONFIG_COMMANDS misc" ;; "msdos" ) CONFIG_COMMANDS="$CONFIG_COMMANDS msdos" ;; "objects" ) CONFIG_COMMANDS="$CONFIG_COMMANDS objects" ;; + "ole" ) CONFIG_COMMANDS="$CONFIG_COMMANDS ole" ;; "programs/regapi/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/regapi/tests" ;; "programs/regedit/tests" ) CONFIG_COMMANDS="$CONFIG_COMMANDS programs/regedit/tests" ;; "relay32" ) CONFIG_COMMANDS="$CONFIG_COMMANDS relay32" ;; @@ -17149,6 +17152,8 @@ echo "$as_me: creating misc" >&6;} && mkdir "misc") ;; echo "$as_me: creating msdos" >&6;} && mkdir "msdos") ;; objects ) test -d "objects" || ({ echo "$as_me:$LINENO: creating objects" >&5 echo "$as_me: creating objects" >&6;} && mkdir "objects") ;; + ole ) test -d "ole" || ({ echo "$as_me:$LINENO: creating ole" >&5 +echo "$as_me: creating ole" >&6;} && mkdir "ole") ;; programs/regapi/tests ) test -d "programs/regapi/tests" || ({ echo "$as_me:$LINENO: creating programs/regapi/tests" >&5 echo "$as_me: creating programs/regapi/tests" >&6;} && mkdir "programs/regapi/tests") ;; programs/regedit/tests ) test -d "programs/regedit/tests" || ({ echo "$as_me:$LINENO: creating programs/regedit/tests" >&5 diff --git a/configure.ac b/configure.ac index b8206237307..7493e0de30e 100644 --- a/configure.ac +++ b/configure.ac @@ -1369,6 +1369,7 @@ WINE_CONFIG_EXTRA_DIR(memory) WINE_CONFIG_EXTRA_DIR(misc) WINE_CONFIG_EXTRA_DIR(msdos) WINE_CONFIG_EXTRA_DIR(objects) +WINE_CONFIG_EXTRA_DIR(ole) WINE_CONFIG_EXTRA_DIR(programs/regapi/tests) WINE_CONFIG_EXTRA_DIR(programs/regedit/tests) WINE_CONFIG_EXTRA_DIR(relay32) @@ -1519,8 +1520,8 @@ include/Makefile library/Makefile libs/Makefile libs/port/Makefile +libs/uuid/Makefile miscemu/Makefile -ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile diff --git a/dlls/kernel/Makefile.in b/dlls/kernel/Makefile.in index 9b740c65c50..ba080ed9fc5 100644 --- a/dlls/kernel/Makefile.in +++ b/dlls/kernel/Makefile.in @@ -42,7 +42,7 @@ MC_SRCS = \ messages/winerr_enu.mc SUBDIRS = tests -EXTRASUBDIRS = messages nls +EXTRASUBDIRS = messages nls $(TOPOBJDIR)/ole @MAKE_DLL_RULES@ diff --git a/libs/Makefile.in b/libs/Makefile.in index 341ba0ec67e..f0b98be35b3 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -5,13 +5,14 @@ VPATH = @srcdir@ MODULE = none SUBDIRS = \ - port + port \ + uuid # Sub-directories to install for install-lib INSTALLLIBSUBDIRS = # Sub-directories to install for install-dev -INSTALLDEVSUBDIRS = +INSTALLDEVSUBDIRS = uuid INSTALLSUBDIRS = $(INSTALLDEVSUBDIRS) $(INSTALLLIBSUBDIRS) diff --git a/ole/.cvsignore b/libs/uuid/.cvsignore similarity index 100% rename from ole/.cvsignore rename to libs/uuid/.cvsignore diff --git a/ole/Makefile.in b/libs/uuid/Makefile.in similarity index 82% rename from ole/Makefile.in rename to libs/uuid/Makefile.in index cfd285ebe84..befd9036893 100644 --- a/ole/Makefile.in +++ b/libs/uuid/Makefile.in @@ -1,20 +1,20 @@ DEFS = @DLLFLAGS@ -D__WINESRC__ TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = .. +TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ -MODULE = none +MODULE = libwine_uuid.a C_SRCS = \ dx8guid.c \ dxguid.c \ uuid.c -all: libwine_uuid.a +all: $(MODULE) @MAKE_RULES@ -libwine_uuid.a: $(OBJS) +$(MODULE): $(OBJS) $(RM) $@ $(AR) $@ $(OBJS) $(RANLIB) $@ diff --git a/ole/dx8guid.c b/libs/uuid/dx8guid.c similarity index 100% rename from ole/dx8guid.c rename to libs/uuid/dx8guid.c diff --git a/ole/dxguid.c b/libs/uuid/dxguid.c similarity index 100% rename from ole/dxguid.c rename to libs/uuid/dxguid.c diff --git a/ole/uuid.c b/libs/uuid/uuid.c similarity index 100% rename from ole/uuid.c rename to libs/uuid/uuid.c