Commit f540ee86 authored by Eli Zaretskii's avatar Eli Zaretskii

Fixed -gdwarf-2 switch and added emacsclientw.exe to lib-src/Makefile.in.

parent 095bf253
......@@ -629,9 +629,6 @@ if test "$ac_test_CFLAGS" != set; then
if test -n "$emacs_g3_CFLAGS"; then
emacs_save_CFLAGS=$CFLAGS
CFLAGS=$emacs_g3_CFLAGS
if test $opsys = mingw32; then
CFLAGS="$CFLAGS -gdwarf-2"
fi
AC_CACHE_CHECK([whether $CC accepts $emacs_g3_CFLAGS],
[emacs_cv_prog_cc_g3],
[AC_LINK_IFELSE([AC_LANG_PROGRAM()],
......@@ -642,6 +639,9 @@ if test "$ac_test_CFLAGS" != set; then
else
CFLAGS=$emacs_save_CFLAGS
fi
if test $opsys = mingw32; then
CFLAGS="$CFLAGS -gdwarf-2"
fi
fi
fi
......@@ -1546,6 +1546,7 @@ W32_OBJ=
W32_LIBS=
EMACSRES=
CLIENTRES=
CLIENTW=
W32_RES_LINK=
EMACS_MANIFEST=
if test "${with_w32}" != no; then
......@@ -1598,6 +1599,7 @@ if test "${HAVE_W32}" = "yes"; then
W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10"
CLIENTRES="emacsclient.res"
CLIENTW="emacsclientw\$(EXEEXT)"
FIRSTFILE_OBJ=firstfile.o
fi
fi
......@@ -1606,6 +1608,7 @@ AC_SUBST(W32_LIBS)
AC_SUBST(EMACSRES)
AC_SUBST(EMACS_MANIFEST)
AC_SUBST(CLIENTRES)
AC_SUBST(CLIENTW)
AC_SUBST(W32_RES_LINK)
AC_SUBST(FIRSTFILE_OBJ)
......
......@@ -113,8 +113,11 @@ MKDIR_P = @MKDIR_P@
# ========================== Lists of Files ===========================
# emacsclientw.exe for MinGW, empty otherwise
CLIENTW = @CLIENTW@
# Things that a user might actually run, which should be installed in bindir.
INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} $(CLIENTW) \
ebrowse${EXEEXT}
INSTALLABLE_SCRIPTS = grep-changelog
......@@ -341,11 +344,16 @@ 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) $(CLIENTRES) $(config_h)
emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
$(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \
-DVERSION="\"${version}\"" $(CLIENTRES) $(LIB_WSOCK32) \
-DVERSION="\"${version}\"" $(LIB_WSOCK32) \
$(LOADLIBES) $(LIB_FDATASYNC) -o emacsclient${EXEEXT}
emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows ${srcdir}/emacsclient.c \
-DVERSION="\"${version}\"" $(LIB_WSOCK32) \
$(LOADLIBES) -lcomctl32 $(LIB_FDATASYNC) -o emacsclient${EXEEXT}
ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h
$(CC) -c ${CPP_CFLAGS} ${srcdir}/ntlib.c
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment