twain_32: Renamed the dlls/twain directory to dlls/twain_32.

2006-04-10 17:29:18 +02:00 · 2006-04-10 17:29:18 +02:00 · 1404dc8014
parent b4f553f5be
commit 1404dc8014
24 changed files with 4 additions and 9 deletions
--- a/4
+++ b/4
--- a/configure.ac
+++ b/configure.ac
@ -1644,7 +1644,7 @@ dlls/stdole32.tlb/Makefile
 dlls/sti/Makefile
 dlls/strmiids/Makefile
 dlls/tapi32/Makefile
-dlls/twain/Makefile
+dlls/twain_32/Makefile
 dlls/unicows/Makefile
 dlls/url/Makefile
 dlls/urlmon/Makefile
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@ -139,7 +139,7 @@ BASEDIRS = \
 	stdole32.tlb \
 	sti \
 	tapi32 \
-	twain \
+	twain_32 \
 	unicows \
 	url \
 	urlmon \
@ -270,7 +270,6 @@ SYMLINKS_SO = \
 	mciwave.drv.so \
 	msacm.drv.so \
 	msisys.ocx.so \
-	twain_32.dll.so \
 	user32.dll.so \
 	winealsa.drv.so \
 	winearts.drv.so \
@ -318,9 +317,6 @@ msacm.drv.so: winmm/wavemap/msacm.drv.so
 msisys.ocx.so: msisys/msisys.ocx.so
 	$(RM) $@ && $(LN_S) msisys/msisys.ocx.so $@

-twain_32.dll.so: twain/twain_32.dll.so
-	$(RM) $@ && $(LN_S) twain/twain_32.dll.so $@
-
 user32.dll.so: user/user32.dll.so
 	$(RM) $@ && $(LN_S) user/user32.dll.so $@

@ -926,7 +922,6 @@ kernel/kernel32.dll.so: kernel
 winmm/mciwave/mciwave.drv.so: winmm/mciwave
 winmm/wavemap/msacm.drv.so: winmm/wavemap
 msisys/msisys.ocx.so: msisys
-twain/twain_32.dll.so: twain
 user/user32.dll.so: user
 winmm/winealsa/winealsa.drv.so: winmm/winealsa
 winmm/winearts/winearts.drv.so: winmm/winearts
--- a/dlls/twain_32/.gitignore
+++ b/dlls/twain_32/.gitignore
--- a/dlls/twain_32/Makefile.in
+++ b/dlls/twain_32/Makefile.in
--- a/dlls/twain_32/README
+++ b/dlls/twain_32/README
--- a/dlls/twain_32/TWAIN
+++ b/dlls/twain_32/TWAIN
--- a/dlls/twain_32/capability.c
+++ b/dlls/twain_32/capability.c
--- a/dlls/twain_32/ds_audio.c
+++ b/dlls/twain_32/ds_audio.c
--- a/dlls/twain_32/ds_ctrl.c
+++ b/dlls/twain_32/ds_ctrl.c
--- a/dlls/twain_32/ds_image.c
+++ b/dlls/twain_32/ds_image.c
--- a/dlls/twain_32/dsm_ctrl.c
+++ b/dlls/twain_32/dsm_ctrl.c
--- a/dlls/twain_32/resource.h
+++ b/dlls/twain_32/resource.h
--- a/dlls/twain_32/rsrc.rc
+++ b/dlls/twain_32/rsrc.rc
--- a/dlls/twain_32/twain.h
+++ b/dlls/twain_32/twain.h
--- a/dlls/twain_32/twain.spec
+++ b/dlls/twain_32/twain.spec
--- a/dlls/twain_32/twain16_main.c
+++ b/dlls/twain_32/twain16_main.c
--- a/dlls/twain_32/twain32_main.c
+++ b/dlls/twain_32/twain32_main.c
--- a/dlls/twain_32/twain_32.spec
+++ b/dlls/twain_32/twain_32.spec
--- a/dlls/twain_32/twain_De.rc
+++ b/dlls/twain_32/twain_De.rc
--- a/dlls/twain_32/twain_En.rc
+++ b/dlls/twain_32/twain_En.rc
--- a/dlls/twain_32/twain_Ko.rc
+++ b/dlls/twain_32/twain_Ko.rc
--- a/dlls/twain_32/twain_i.h
+++ b/dlls/twain_32/twain_i.h
--- a/dlls/twain_32/ui.c
+++ b/dlls/twain_32/ui.c