[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] xwidget_mvp 44e37d7: Fix compile in the non-xwidget case
From: |
Joakim Verona |
Subject: |
[Emacs-diffs] xwidget_mvp 44e37d7: Fix compile in the non-xwidget case |
Date: |
Sat, 14 Feb 2015 20:55:35 +0000 |
branch: xwidget_mvp
commit 44e37d7dce53084bc5636a1adc1404266d10e6cb
Author: Joakim Verona <address@hidden>
Commit: Joakim Verona <address@hidden>
Fix compile in the non-xwidget case
---
configure.ac | 3 ++-
src/Makefile.in | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 82554ec..f3b2233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2529,7 +2529,7 @@ fi
HAVE_XWIDGETS=no
HAVE_WEBKIT=no
HAVE_GIR=no
-
+XWDIGETS_OBJ=
if test "$with_xwidgets" != "no" && test "$USE_GTK_TOOLKIT" = "GTK3" &&
test "$window_system" != "none"
then
@@ -2557,6 +2557,7 @@ then
if test $HAVE_GIR = yes; then
AC_DEFINE([HAVE_GIR], 1, [Define to 1 if you have GIR support.])
fi
+ XWDIGETS_OBJ=xwidget.o
fi
CFLAGS=$OLD_CFLAGS
diff --git a/src/Makefile.in b/src/Makefile.in
index 81977db..1493e89 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -379,13 +379,12 @@ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o
$(XMENU_OBJ) window.o \
process.o gnutls.o callproc.o \
region-cache.o sound.o atimer.o \
doprnt.o intervals.o textprop.o composite.o xml.o $(NOTIFY_OBJ) \
- xwidget.o \
+ $(XWIDGETS_OBJ) \
profiler.o decompress.o \
$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ)
obj = $(base_obj) $(NS_OBJC_OBJ)
-xwidget.o: xwidget.c xwidget.h
## Object files used on some machine or other.
## These go in the DOC file on all machines in case they are needed.
## Some of them have no DOC entries, but it does no harm to have them
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] xwidget_mvp 44e37d7: Fix compile in the non-xwidget case,
Joakim Verona <=