Merged dlls/ver into dlls/version.

Makefile.in

@@ -62,7 +62,6 @@ LIBSUBDIRS = \
 	dlls/sound \
 	dlls/stress \
 	dlls/tapi32 \
-	dlls/ver \
 	dlls/version \
 	dlls/win32s \
 	dlls/win87em \
@@ -177,7 +176,6 @@ LIBOBJS = \
 	dlls/sound/sound.o \
 	dlls/stress/stress.o \
 	dlls/tapi32/tapi32.o \
-	dlls/ver/ver.o \
 	dlls/version/version.o \
 	dlls/win32s/win32s.o \
 	dlls/win87em/win87em.o \

configure

@@ -6106,7 +6106,6 @@ dlls/shell32/Makefile
 dlls/sound/Makefile
 dlls/stress/Makefile
 dlls/tapi32/Makefile
-dlls/ver/Makefile
 dlls/version/Makefile
 dlls/win32s/Makefile
 dlls/win87em/Makefile
@@ -6317,7 +6316,6 @@ dlls/shell32/Makefile
 dlls/sound/Makefile
 dlls/stress/Makefile
 dlls/tapi32/Makefile
-dlls/ver/Makefile
 dlls/version/Makefile
 dlls/win32s/Makefile
 dlls/win87em/Makefile

configure.in

@@ -934,7 +934,6 @@ dlls/shell32/Makefile
 dlls/sound/Makefile
 dlls/stress/Makefile
 dlls/tapi32/Makefile
-dlls/ver/Makefile
 dlls/version/Makefile
 dlls/win32s/Makefile
 dlls/win87em/Makefile

dlls/Makefile.in

@@ -30,7 +30,6 @@ SUBDIRS = \
 	sound \
 	stress \
 	tapi32 \
-	ver \
 	version \
 	win32s \
 	win87em \

dlls/ver/.cvsignore

-Makefile
-*.spec.c
-*.spec.glue.s

dlls/ver/Makefile.in

-DEFS      = @DLLFLAGS@ -D__WINE__
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = ver
-
-SPEC_SRCS = ver.spec
-
-C_SRCS = \
-	ver16.c
-
-all: $(MODULE).o
-
-@MAKE_RULES@
-
-### Dependencies:

dlls/version/Makefile.in

@@ -5,12 +5,13 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = version
 
-SPEC_SRCS = version.spec
+SPEC_SRCS = ver.spec version.spec
 
 C_SRCS = \
 	info.c \
 	install.c \
-	resource.c
+	resource.c \
+	ver16.c
 
 all: $(MODULE).o