From: Yuuki Harano <masm+github@masm11.me>
Date: Mon, 8 Mar 2021 12:20:54 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3719
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4dda6db3abf4a67455a007d28e14d62a9909f665;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
---

4dda6db3abf4a67455a007d28e14d62a9909f665
diff --cc src/Makefile.in
index 5c6098bfed5,f3c545dba9a..39c077b694b
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -428,8 -400,8 +403,8 @@@ base_obj = dispnew.o frame.o scroll.o x
  	profiler.o decompress.o \
  	thread.o systhread.o \
  	$(if $(HYBRID_MALLOC),sheap.o) \
 -	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
 +	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(PGTK_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
- 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) $(GMP_OBJ)
+ 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ)
  obj = $(base_obj) $(NS_OBJC_OBJ)
  
  ## Object files used on some machine or other.