diff options
author | Eli Zaretskii <eliz@gnu.org> | 2013-03-31 17:04:49 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2013-03-31 17:04:49 +0300 |
commit | a74b0e1bdf0f2f49bce82dd7e15264c5c548d980 (patch) | |
tree | 298164fad366b018ea71d2b0c791dd3442b43f02 /lib-src/Makefile.in | |
parent | 65d72c1bf862d339d72d760e7ac8ccbc4837f06b (diff) | |
download | emacs-a74b0e1bdf0f2f49bce82dd7e15264c5c548d980.tar.gz |
Added nt/gnulib.mk and removed kludges from ms-w32.h and ntlib.h.
Diffstat (limited to 'lib-src/Makefile.in')
-rw-r--r-- | lib-src/Makefile.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 903dbfcf7b9..5e40c2555cf 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -171,7 +171,7 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \ $(COM_ERRLIB) $(LIBHESIOD) $(LIBRESOLV) ## Extra object files for linking emacsclient -NTLIB_O = @NTLIB_O@ +NTLIB = @NTLIB@ ## Some systems define this to request special libraries. LIBS_SYSTEM = @LIBS_SYSTEM@ @@ -331,15 +331,15 @@ make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \ -o make-docfile${EXEEXT} -movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB_O) $(config_h) +movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \ - $(NTLIB_O) $(LIB_WSOCK32) $(LOADLIBES) $(LIBS_MOVE) \ + $(NTLIB) $(LIB_WSOCK32) $(LOADLIBES) $(LIBS_MOVE) \ -o movemail${EXEEXT} 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_O) $(config_h) +emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ -DVERSION="\"${version}\"" $(LIB_WSOCK32) \ $(LOADLIBES) $(LIB_FDATASYNC) -o emacsclient${EXEEXT} @@ -350,9 +350,9 @@ ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h hexl${EXEEXT}: ${srcdir}/hexl.c $(config_h) $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl${EXEEXT} -update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB_O) $(config_h) +update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ - ${srcdir}/update-game-score.c $(NTLIB_O) $(LOADLIBES) \ + ${srcdir}/update-game-score.c $(NTLIB) $(LOADLIBES) \ -o update-game-score${EXEEXT} ## Makefile ends here. |