Alexandre Julliard : rasapi32: Make rasapi16. dll into a stand-alone 16-bit module.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e475ef89fdb870411f73da9e14480d62b5aa3a6f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e475ef89fdb870411f73da9e14...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Mon Mar 23 20:34:34 2009 +0100

rasapi32: Make rasapi16.dll into a stand-alone 16-bit module.

---

 .gitignore                                         |    1 -
 configure                                          |    9 +++++++++
 configure.ac                                       |    1 +
 dlls/Makefile.in                                   |    4 ----
 dlls/rasapi16.dll16/Makefile.in                    |   13 +++++++++++++
 .../rasapi16.dll16.spec}                           |    0 
 dlls/rasapi32/Makefile.in                          |    2 --
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b5e888..76e57f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,6 @@ dlls/qmgr/qmgr_local_i.c
 dlls/qmgrprxy/qmgrprxy.h
 dlls/qmgrprxy/qmgrprxy_i.c
 dlls/qmgrprxy/qmgrprxy_p.c
-dlls/rasapi16.dll16
 dlls/rpcrt4/epm.h
 dlls/rpcrt4/epm_c.c
 dlls/rpcrt4/tests/server.h
diff --git a/configure b/configure
index fe3756a..7cd8973 100755
--- a/configure
+++ b/configure
@@ -26800,6 +26800,14 @@ dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules"
 ac_config_files="$ac_config_files dlls/query/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
+	dlls/rasapi16.dll16/Makefile"
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+	rasapi16.dll16"
+ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
+dlls/rasapi16.dll16/Makefile: dlls/rasapi16.dll16/Makefile.in dlls/Makedll.rules"
+ac_config_files="$ac_config_files dlls/rasapi16.dll16/Makefile"
+
+ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/rasapi32/Makefile"
 test "x$enable_rasapi32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	rasapi32"
@@ -29325,6 +29333,7 @@ do
     "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;;
     "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;;
     "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;;
+    "dlls/rasapi16.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi16.dll16/Makefile" ;;
     "dlls/rasapi32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/Makefile" ;;
     "dlls/rasapi32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasapi32/tests/Makefile" ;;
     "dlls/rasdlg/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/rasdlg/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 7616588..b1c7377 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2164,6 +2164,7 @@ WINE_CONFIG_MAKEFILE([dlls/qmgrprxy/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
 WINE_CONFIG_MAKEFILE([dlls/quartz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/quartz/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/query/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/rasapi16.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/rasapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/rasapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/rasdlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index ac1767a..928b6c3 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -25,7 +25,6 @@ WIN16_FILES = \
 	krnl386.exe16 \
 	mmsystem.dll16 \
 	msvideo.dll16 \
-	rasapi16.dll16 \
 	setupx.dll16 \
 	shell.dll16 \
 	sound.drv16 \
@@ -64,9 +63,6 @@ krnl386.exe16 system.drv16 toolhelp.dll16:
 msvideo.dll16:
 	echo "msvfw32.dll" >$@
 
-rasapi16.dll16:
-	echo "rasapi32.dll" >$@
-
 setupx.dll16:
 	echo "setupapi.dll" >$@
 
diff --git a/dlls/rasapi16.dll16/Makefile.in b/dlls/rasapi16.dll16/Makefile.in
new file mode 100644
index 0000000..ae51282
--- /dev/null
+++ b/dlls/rasapi16.dll16/Makefile.in
@@ -0,0 +1,13 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = rasapi16.dll16
+IMPORTS   = kernel32
+EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,rasapi32.dll
+
+SPEC_SRCS = rasapi16.dll16.spec
+
+(a)MAKE_DLL_RULES@
+
+(a)DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/rasapi32/rasapi16.spec b/dlls/rasapi16.dll16/rasapi16.dll16.spec
similarity index 100%
rename from dlls/rasapi32/rasapi16.spec
rename to dlls/rasapi16.dll16/rasapi16.dll16.spec
diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in
index 12bbd65..ce4f34d 100644
--- a/dlls/rasapi32/Makefile.in
+++ b/dlls/rasapi32/Makefile.in
@@ -8,8 +8,6 @@ IMPORTS   = kernel32
 
 C_SRCS = rasapi.c
 
-SPEC_SRCS16 = rasapi16.spec
-
 @MAKE_DLL_RULES@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend