Latest version from Cyclic; files missed in first run

1 files changed, 83 insertions, 16 deletions

diff --git a/gnu/usr.bin/cvs/emx/Makefile b/gnu/usr.bin/cvs/emx/Makefile
index d56fe6da3eb..425dfbdc390 100644
--- a/gnu/usr.bin/cvs/emx/Makefile
+++ b/gnu/usr.bin/cvs/emx/Makefile
@@ -11,22 +11,23 @@ project: cvs.exe
 install_dir = s:/gnu/util
 
 # srcdir is usually "."
-srcdir     = .
+srcdir     = ../../work/ccvs/emx
 
 # top_srcdir is usually ".."
-top_srcdir = ..
+top_srcdir = ../../work/ccvs
 
 lib_dir     = ${top_srcdir}/lib
 cvs_srcdir = ${top_srcdir}/src
-
+diff_srcdir = ${top_srcdir}/diff
 zlib_dir = ${top_srcdir}/zlib
 
 # Do we need these?
 # prefix = /usr/local
 # exec_prefix = ${prefix}
 
-# taken straight from the example project
-LIB = -lufc -lsocket
+# Used to say -lufc, but that would only be needed for crypt().
+LIB = -lsocket
+
 CINC =
 # This says we are building an object file, not a full executable.
 OBJ_CFLAGS = -c
@@ -56,12 +57,18 @@ COMMON_HEADERS = \
        ${cvs_srcdir}/server.h \
        ${cvs_srcdir}/error.h
 
+# headers in ../diff
+DIFF_HEADERS = \
+       ${diff_srcdir}/cmpbuf.h \
+	   ${diff_srcdir}/diff.h \
+	   ${diff_srcdir}/system.h 
+
 # sources specific to OS/2
 OS2_SOURCES = \
        ${srcdir}/filesubr.c \
        ${srcdir}/startserver.c \
        ${srcdir}/stripslash.c \
-       ${srcdir}/rcmd.c \
+       ${srcdir}/savecwd.c \
        ${srcdir}/system.c
 
 # sources we use from the common src dir, ../src
@@ -121,6 +128,22 @@ COMMON_SOURCES = \
        ${cvs_srcdir}/zlib.c
 # end of $COMMON_SOURCES
 
+# sources in ../diff
+DIFF_SOURCES = \
+	   ${diff_srcdir}/analyze.c \
+	   ${diff_srcdir}/cmpbuf.c \
+	   ${diff_srcdir}/context.c \
+	   ${diff_srcdir}/diff.c \
+	   ${diff_srcdir}/diff3.c \
+	   ${diff_srcdir}/dir.c \
+	   ${diff_srcdir}/ed.c \
+	   ${diff_srcdir}/ifdef.c \
+	   ${diff_srcdir}/io.c \
+	   ${diff_srcdir}/normal.c \
+	   ${diff_srcdir}/side.c \
+	   ${diff_srcdir}/util.c \
+	   ${diff_srcdir}/version.c 
+
 # sources from ../lib
 # FIXME: Is this used anywhere?  I don't think it is.
 LIB_SOURCES = \
@@ -131,19 +154,19 @@ LIB_SOURCES = \
        ${lib_dir}/getopt1.c \
        ${lib_dir}/md5.c \
        ${lib_dir}/regex.c \
-       ${lib_dir}/savecwd.c \
        ${lib_dir}/sighandle.c \
        ${lib_dir}/valloc.c \
-       ${lib_dir}/xgetwd.c \
        ${lib_dir}/yesno.c \
        ${lib_dir}/getdate.c
 
 # object files from OS/2 sources
+# was       ${srcdir}/rcmd.o
 OS2_OBJECTS = \
        ${srcdir}/filesubr.o \
        ${srcdir}/startserver.o \
        ${srcdir}/stripslash.o \
-       ${srcdir}/rcmd.o \
+       ${top_srcdir}/windows-NT/rcmd.o \
+       ${srcdir}/savecwd.o \
        ${srcdir}/system.o
 
 # object files from ../src
@@ -202,6 +225,22 @@ COMMON_OBJECTS = \
        ${cvs_srcdir}/zlib.o
 # end of $COMMON_OBJECTS
 
+# object files in ../diff
+DIFF_OBJECTS = \
+       ${diff_srcdir}/analyze.o \
+	   ${diff_srcdir}/cmpbuf.o \
+	   ${diff_srcdir}/context.o \
+	   ${diff_srcdir}/diff.o \
+	   ${diff_srcdir}/diff3.o \
+	   ${diff_srcdir}/dir.o \
+	   ${diff_srcdir}/ed.o \
+	   ${diff_srcdir}/ifdef.o \
+	   ${diff_srcdir}/io.o \
+	   ${diff_srcdir}/normal.o \
+	   ${diff_srcdir}/side.o \
+	   ${diff_srcdir}/util.o \
+	   ${diff_srcdir}/version.o 
+
 # objects from ../lib
 LIB_OBJECTS = \
        ${lib_dir}/vasprintf.o \
@@ -211,10 +250,8 @@ LIB_OBJECTS = \
        ${lib_dir}/getopt1.o \
        ${lib_dir}/md5.o \
        ${lib_dir}/regex.o \
-       ${lib_dir}/savecwd.o \
        ${lib_dir}/sighandle.o \
        ${lib_dir}/valloc.o \
-       ${lib_dir}/xgetwd.o \
        ${lib_dir}/yesno.o \
        ${lib_dir}/getdate.o
 
@@ -233,14 +270,15 @@ ZLIB_OBJECTS = ${zlib_dir}/adler32.o \
        ${zlib_dir}/infutil.o \
        ${zlib_dir}/inffast.o
 
-SOURCES = ${COMMON_SOURCES} ${LIB_SOURCES} ${OS2_SOURCES}
-HEADERS = ${COMMON_HEADERS} ${OS2_HEADERS}
-OBJECTS = ${COMMON_OBJECTS} ${LIB_OBJECTS} ${OS2_OBJECTS} ${ZLIB_OBJECTS}
+SOURCES = ${COMMON_SOURCES} ${LIB_SOURCES} ${OS2_SOURCES} ${DIFF_SOURCES}
+HEADERS = ${COMMON_HEADERS} ${OS2_HEADERS} ${DIFF_HEADERS}
+OBJECTS = ${COMMON_OBJECTS} ${LIB_OBJECTS} ${OS2_OBJECTS} ${DIFF_OBJECTS} \
+  ${ZLIB_OBJECTS}
 
 DISTFILES = ${OS2_HEADERS} ${OS2_SOURCES} \
   ${srcdir}/README ${srcdir}/ChangeLog \
   ${srcdir}/Makefile.in ${srcdir}/.cvsignore \
-  ${srcdir}Makefile
+  Makefile
 
 all:
 
@@ -275,6 +313,7 @@ dist-dir:
 clean:
 	rm -f cvs.exe cvs.out
 	rm -f ${srcdir}/*.o
+	rm -f ${diff_srcdir}/*.o
 	rm -f ${lib_dir}/*.o ${lib_dir}/*.a
 	rm -f ${zlib_dir}/*.o ${zlib_dir}/*.a
 	rm -f ${cvs_srcdir}/*.o
@@ -282,6 +321,7 @@ clean:
 clean-cvs:
 	del cvs.exe cvs.out
 	del $(subst /,\,${srcdir}/*.o)
+	del $(subst /,\,${diff_srcdir}/*.o)
 	del $(subst /,\,${lib_dir}/*.o ${lib_dir}/*.a)
 	del $(subst /,\,${zlib_dir}/*.o ${zlib_dir}/*.a)
 	del $(subst /,\,${cvs_srcdir}/*.o)
@@ -298,13 +338,40 @@ ${lib_dir}/libcvs.a: $(LIB_OBJECTS)
 ${zlib_dir}/libz.a: $(ZLIB_OBJECTS)
 	$(AR) cr $@ $(ZLIB_OBJECTS)
 
+# Eventually probably static linking (cvs-static.exe) will be the
+# default, but even so we'll want to preserve this rule so we can
+# create a dynamically linked executable when we want coredumps.
 cvs.exe: ${OBJECTS} ${lib_dir}/libcvs.a ${zlib_dir}/libz.a
-	gcc $(COMMON_OBJECTS) $(OS2_OBJECTS) ${lib_dir}/libcvs.a ${zlib_dir}/libz.a $(LIB) -o cvs.out
+	gcc $(COMMON_OBJECTS) $(OS2_OBJECTS) ${DIFF_OBJECTS} ${lib_dir}/libcvs.a ${zlib_dir}/libz.a $(LIB) -o cvs.out
 	emxbind -w -o $@.exe cvs.out
 
+${lib_dir}/libcvs.lib: ${lib_dir}/libcvs.a
+	emxomf ${lib_dir}/libcvs.a
+
+${zlib_dir}/libz.lib: ${zlib_dir}/libz.a
+	emxomf ${zlib_dir}/libz.a
+
+# Where do -Zomf -Zsys go?  When we compile the .o's?
+# When I tried this rule, I had problems with (1) could not find
+# socket.lib.  Hmm.  I thought I converted it from socket.a
+# in the EMX distribution.  Probably my EMX installation at fault.
+# (2) could not find miscellaneous system routines like strerror.
+# This might be a matter of learning to live without them (EMX
+# doc is supposed to describe which are present and which are not).
+# (3) some linker errors like no stack and the like.  Maybe I am
+# missing some options?
+cvs-static.exe: ${OBJECTS} ${lib_dir}/libcvs.lib ${zlib_dir}/libz.lib
+	emxomf ${OBJECTS}
+	emxomfld -o $@ $(subst .o,.obj,${OBJECTS}) \
+	  ${lib_dir}/libcvs.lib ${zlib_dir}/libz.lib ${LIB}
+
 # cvs.o: ${OBJECTS} ${SOURCES} ${HEADERS}
 
 subdir = emx
+# Hmm.  This rule wants to exist on unix, so that "make dist" works.
+# And it doesn't want to exist on OS/2, because configure doesn't
+# run on OS/2 and so ../config.status won't exist.  For now we just
+# say, in emx/README, that people will need to comment it out.
 Makefile: ../config.status $(srcdir)/Makefile.in
 	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status