Added nt/Makefile.in and appropriate tweaks to configure.ac.

Added emacsclient.res support to lib-src/.
Fixed temacs and dumping commands in src/Makefile.in.
Miscellaneous fixes all over the place.

Not tried to build yet.

1 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 5e40c2555cf..c7bfc207608 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -172,6 +172,8 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
 
 ## Extra object files for linking emacsclient
 NTLIB = @NTLIB@
+CLIENTRES = @CLIENTRES@
+WINDRES = @WINDRES@
 
 ## Some systems define this to request special libraries.
 LIBS_SYSTEM = @LIBS_SYSTEM@
@@ -339,9 +341,9 @@ movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
 pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h $(config_h)
         $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c
 
-emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
+emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
         $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
-           -DVERSION="\"${version}\"" $(LIB_WSOCK32) \
+           -DVERSION="\"${version}\"" $(CLIENTRES) $(LIB_WSOCK32) \
            $(LOADLIBES) $(LIB_FDATASYNC) -o emacsclient${EXEEXT}
 
 ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h
@@ -355,4 +357,7 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
           ${srcdir}/update-game-score.c $(NTLIB) $(LOADLIBES) \
           -o update-game-score${EXEEXT}
 
+emacsclient.res: ${srcdir}/nt/emacsclient.rc
+        $(WINDRES) -O coff --include-dir=${srcdir}/nt -o emacscient.res
+
 ## Makefile ends here.