From 54dc94ebf823716d49b880a6ec9dc8842da137d7 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 23 Jan 2000 22:56:08 +0000 Subject: [PATCH] Merged dlls/ver into dlls/version. --- Makefile.in | 2 -- configure | 2 -- configure.in | 1 - dlls/Makefile.in | 1 - dlls/ver/.cvsignore | 3 --- dlls/ver/Makefile.in | 17 ----------------- dlls/version/Makefile.in | 5 +++-- dlls/{ver => version}/ver.spec | 0 dlls/{ver => version}/ver16.c | 0 9 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 dlls/ver/.cvsignore delete mode 100644 dlls/ver/Makefile.in rename dlls/{ver => version}/ver.spec (100%) rename dlls/{ver => version}/ver16.c (100%) diff --git a/Makefile.in b/Makefile.in index c5a248b510..bd2af5e527 100644 --- a/Makefile.in +++ b/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 \ diff --git a/configure b/configure index 613c395de4..070415fdfe 100755 --- a/configure +++ b/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 diff --git a/configure.in b/configure.in index 308fcc5d33..e2db0a351c 100644 --- a/configure.in +++ b/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 diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 807c8afdd6..ed6bf3ed5c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -30,7 +30,6 @@ SUBDIRS = \ sound \ stress \ tapi32 \ - ver \ version \ win32s \ win87em \ diff --git a/dlls/ver/.cvsignore b/dlls/ver/.cvsignore deleted file mode 100644 index 227d8393cc..0000000000 --- a/dlls/ver/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -*.spec.c -*.spec.glue.s diff --git a/dlls/ver/Makefile.in b/dlls/ver/Makefile.in deleted file mode 100644 index b2f27c22c9..0000000000 --- a/dlls/ver/Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -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: diff --git a/dlls/version/Makefile.in b/dlls/version/Makefile.in index ce74c6c501..07dbeee4df 100644 --- a/dlls/version/Makefile.in +++ b/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 diff --git a/dlls/ver/ver.spec b/dlls/version/ver.spec similarity index 100% rename from dlls/ver/ver.spec rename to dlls/version/ver.spec diff --git a/dlls/ver/ver16.c b/dlls/version/ver16.c similarity index 100% rename from dlls/ver/ver16.c rename to dlls/version/ver16.c