Mercurial > hg > RemoteEditor > vim7

changeset 42:791f78caf8b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile fix (not work)
author Daichi TOMA <e085740@ie.u-ryukyu.ac.jp>
date Sun, 19 Dec 2010 22:21:24 +0900
parents 933cecbe6f83
children fd31df305668
files src/Makefile src/auto/config.h src/auto/config.mk src/auto/osdef.h src/auto/pathdef.c
diffstat 5 files changed, 261 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile	Sun Dec 19 03:22:37 2010 +0900
+++ b/src/Makefile	Sun Dec 19 22:21:24 2010 +0900
@@ -1283,6 +1283,11 @@
 ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_xmdlg.c gui_xmebw.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c
 ALL_GUI_PRO  = gui.pro gui_gtk.pro gui_motif.pro gui_xmdlg.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w16.pro gui_w32.pro gui_photon.pro
 
+# REMOTE EDITOR files
+REDITOR_SRC = reditor.c
+REDITOR_OBJ = objects/reditor.o
+
+
 # }}}
 
 ### Command to create dependencies based on #include "..."
@@ -1447,6 +1452,7 @@
 	popupmnu.c \
 	quickfix.c \
 	regexp.c \
+	reditor.c \
 	screen.c \
 	search.c \
 	sha256.c \
@@ -1530,6 +1536,7 @@
 	objects/popupmnu.o \
 	objects/quickfix.o \
 	objects/regexp.o \
+	objects/reditor.o \
 	objects/screen.o \
 	objects/search.o \
 	objects/sha256.o \
@@ -1595,6 +1602,7 @@
 	popupmnu.pro \
 	quickfix.pro \
 	regexp.pro \
+	reditor.pro \
 	screen.pro \
 	search.pro \
 	sha256.pro \
@@ -2404,6 +2412,9 @@
 objects/blowfish.o: blowfish.c
 	$(CCC) -o $@ blowfish.c
 
+objects/reditor.o: reditor.c
+	$(CCC) -o $@ reditor.c
+
 objects/buffer.o: buffer.c
 	$(CCC) -o $@ buffer.c
 
@@ -2657,6 +2668,9 @@
 objects/netbeans.o: netbeans.c
 	$(CCC) -o $@ netbeans.c
 
+objects/reditor.o: reditor.c
+	$(CCC) -o $@ reditor.c
+
 Makefile:
 	@echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
 
@@ -2750,6 +2764,10 @@
  auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
  regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
  globals.h farsi.h arabic.h
+objects/reditor.o: reditor.c vim.h auto/config.h feature.h os_unix.h \
+ auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
+ regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
+ globals.h farsi.h arabic.h reditor.h
 objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
@@ -2785,7 +2803,7 @@
 objects/ex_docmd.o: ex_docmd.c vim.h auto/config.h feature.h os_unix.h \
  auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
  regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
- globals.h farsi.h arabic.h
+ globals.h farsi.h arabic.h reditor.h
 objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
@@ -2825,7 +2843,7 @@
 objects/main.o: main.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
- arabic.h farsi.c arabic.c
+ arabic.h farsi.c arabic.c reditor.h
 objects/mark.o: mark.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
@@ -2837,7 +2855,7 @@
 objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
- arabic.h
+ arabic.h reditor.h
 objects/menu.o: menu.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
@@ -2849,7 +2867,7 @@
 objects/misc1.o: misc1.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
- arabic.h version.h
+ arabic.h version.h reditor.h
 objects/misc2.o: misc2.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
@@ -2876,7 +2894,7 @@
 objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
- arabic.h if_mzsch.h os_unixx.h
+ arabic.h if_mzsch.h os_unixx.h reditor.h
 objects/pathdef.o: auto/pathdef.c vim.h auto/config.h feature.h os_unix.h \
  auto/osdef.h ascii.h keymap.h term.h macros.h option.h structs.h \
  regexp.h gui.h gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h \
@@ -2922,7 +2940,7 @@
  arabic.h
 objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \
  keymap.h term.h macros.h option.h structs.h regexp.h gui.h gui_beval.h \
- proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h
+ proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h arabic.h reditor.h
 objects/undo.o: undo.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \
  ascii.h keymap.h term.h macros.h option.h structs.h regexp.h gui.h \
  gui_beval.h proto/gui_beval.pro ex_cmds.h proto.h globals.h farsi.h \
--- a/src/auto/config.h	Sun Dec 19 03:22:37 2010 +0900
+++ b/src/auto/config.h	Sun Dec 19 22:21:24 2010 +0900
@@ -31,12 +31,27 @@
 /* Define when __DATE__ " " __TIME__ can be used */
 #define HAVE_DATE_TIME 1
 
+/* Define when __attribute__((unused)) can be used */
+#define HAVE_ATTRIBUTE_UNUSED 1
+
 /* defined always when using configure */
 #define UNIX 1
 
 /* Defined to the size of an int */
 #define SIZEOF_INT 4
 
+/* Defined to the size of a long */
+#define SIZEOF_LONG 8
+
+/* Defined to the size of off_t */
+#define SIZEOF_OFF_T 8
+
+/* Defined to the size of time_t */
+#define SIZEOF_TIME_T 8
+
+/* Define when wchar_t is only 2 bytes. */
+/* #undef SMALL_WCHAR_T */
+
 /*
  * If we cannot trust one of the following from the libraries, we use our
  * own safe but probably slower vim_memmove().
@@ -51,6 +66,9 @@
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
 
+/* Define to empty if the keyword does not work.  */
+/* #undef volatile */
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef mode_t */
 
@@ -66,6 +84,9 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef uid_t */
 
+/* Define to `unsigned int' or other type that is 32 bit.  */
+/* #undef uint32_t */
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 /* #undef gid_t */
 
@@ -75,6 +96,9 @@
 /* Define to `unsigned' if <sys/types.h> doesn't define.  */
 /* #undef dev_t */
 
+/* Define on big-endian machines */
+/* #undef WORDS_BIGENDIAN */
+
 /* Define to `unsigned long' if <sys/types.h> doesn't define.  */
 /* #undef rlim_t */
 
@@ -136,7 +160,6 @@
 #define HAVE_FCHOWN 1
 #define HAVE_FSEEKO 1
 #define HAVE_FSYNC 1
-#define HAVE_FTELLO 1
 #define HAVE_GETCWD 1
 /* #undef HAVE_GETPSEUDOTTY */
 #define HAVE_GETPWNAM 1
@@ -149,6 +172,7 @@
 #define HAVE_LSTAT 1
 #define HAVE_MEMCMP 1
 #define HAVE_MEMSET 1
+#define HAVE_MKDTEMP 1
 #define HAVE_NANOSLEEP 1
 #define HAVE_OPENDIR 1
 #define HAVE_FLOAT_FUNCS 1
@@ -188,6 +212,11 @@
 #define HAVE_UTIME 1
 /* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
 
+/* Define, if needed, for accessing large files. */
+/* #undef _LARGE_FILES */
+/* #undef _FILE_OFFSET_BITS */
+/* #undef _LARGEFILE_SOURCE */
+
 /* Define if you do not have utime(), but do have the utimes() function. */
 #define HAVE_UTIMES 1
 
@@ -197,6 +226,7 @@
 #define HAVE_FCNTL_H 1
 /* #undef HAVE_FRAME_H */
 #define HAVE_ICONV_H 1
+#define HAVE_INTTYPES_H 1
 #define HAVE_LANGINFO_H 1
 #define HAVE_LIBC_H 1
 #define HAVE_LIBGEN_H 1
@@ -209,6 +239,7 @@
 #define HAVE_PWD_H 1
 #define HAVE_SETJMP_H 1
 #define HAVE_SGTTY_H 1
+#define HAVE_STDINT_H 1
 #define HAVE_STRINGS_H 1
 /* #undef HAVE_STROPTS_H */
 /* #undef HAVE_SYS_ACCESS_H */
@@ -227,12 +258,13 @@
 /* #undef HAVE_SYS_SYSINFO_H */
 /* #undef HAVE_SYS_SYSTEMINFO_H */
 #define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_UTSNAME_H 1
-#define HAVE_WCHAR_H 1
-#define HAVE_WCTYPE_H 1
 #define HAVE_TERMCAP_H 1
 #define HAVE_TERMIOS_H 1
 /* #undef HAVE_TERMIO_H */
+#define HAVE_WCHAR_H 1
+#define HAVE_WCTYPE_H 1
 #define HAVE_UNISTD_H 1
 /* #undef HAVE_UTIL_DEBUG_H */
 /* #undef HAVE_UTIL_MSGI18N_H */
@@ -285,18 +317,42 @@
 /* Define if you want huge features. */
 /* #undef FEAT_HUGE */
 
+/* Define if you want to include the Lua interpreter. */
+/* #undef FEAT_LUA */
+
+/* Define for linking via dlopen() or LoadLibrary() */
+/* #undef DYNAMIC_LUA */
+
 /* Define if you want to include the MzScheme interpreter. */
 /* #undef FEAT_MZSCHEME */
 
 /* Define if you want to include the Perl interpreter. */
 /* #undef FEAT_PERL */
 
+/* Define for linking via dlopen() or LoadLibrary() */
+/* #undef DYNAMIC_PERL */
+
 /* Define if you want to include the Python interpreter. */
 /* #undef FEAT_PYTHON */
 
+/* Define if you want to include the Python3 interpreter. */
+/* #undef FEAT_PYTHON3 */
+
+/* Define for linking via dlopen() or LoadLibrary() */
+/* #undef DYNAMIC_PYTHON */
+
+/* Define for linking via dlopen() or LoadLibrary() */
+/* #undef DYNAMIC_PYTHON3 */
+
+/* Define if dynamic python does not require RTLD_GLOBAL */
+/* #undef PY_NO_RTLD_GLOBAL */
+
 /* Define if you want to include the Ruby interpreter. */
 /* #undef FEAT_RUBY */
 
+/* Define for linking via dlopen() or LoadLibrary() */
+/* #undef DYNAMIC_RUBY */
+
 /* Define if you want to include the Tcl interpreter. */
 /* #undef FEAT_TCL */
 
@@ -335,9 +391,6 @@
 /* Define if you use KDE and want KDE Toolbar support. */
 /* #undef FEAT_KDETOOLBAR */
 
-/* Define if GTK+ 2 is available. */
-/* #undef HAVE_GTK2 */
-
 /* Define if GTK+ multihead support is available (requires GTK+ >= 2.1.1). */
 /* #undef HAVE_GTK_MULTIHEAD */
 
@@ -379,3 +432,6 @@
 
 /* Define if you want XSMP interaction as well as vanilla swapfile safety */
 #define USE_XSMP_INTERACT 1
+
+/* Define if fcntl()'s F_SETFD command knows about FD_CLOEXEC */
+#define HAVE_FD_CLOEXEC 1
--- a/src/auto/config.mk	Sun Dec 19 03:22:37 2010 +0900
+++ b/src/auto/config.mk	Sun Dec 19 22:21:24 2010 +0900
@@ -1,5 +1,169 @@
-the first targets to make vim are: scratch config myself
-srcdir = .
-VIMNAME = vim
-EXNAME = ex
-VIEWNAME = view
+#
+# config.mk.in -- autoconf template for Vim on Unix		vim:ts=8:sw=8:
+#
+# DO NOT EDIT config.mk!!  It will be overwritten by configure.
+# Edit Makefile and run "make" or run ./configure with other arguments.
+#
+# Configure does not edit the makefile directly. This method is not the
+# standard use of GNU autoconf, but it has two advantages:
+#   a) The user can override every choice made by configure.
+#   b) Modifications to the makefile are not lost when configure is run.
+#
+# I hope this is worth being nonstandard. jw.
+
+
+
+VIMNAME		= vim
+EXNAME		= ex
+VIEWNAME	= view
+
+CC		= gcc
+DEFS		= -DHAVE_CONFIG_H
+CFLAGS		= -O2 -fno-strength-reduce -Wall -D_FORTIFY_SOURCE=1
+CPPFLAGS	=  -DMACOS_X_UNIX -no-cpp-precomp
+srcdir		= .
+
+LDFLAGS		=  -L/usr/local/lib
+LIBS		= -lm -lncurses  -liconv -framework Cocoa
+TAGPRG		= ctags -I INIT+ --fields=+S
+
+CPP		= gcc -E
+CPP_MM		= M
+DEPEND_CFLAGS_FILTER = | sed 's+-I */+-isystem /+g'
+LINK_AS_NEEDED	= 
+X_CFLAGS	= 
+X_LIBS_DIR	= 
+X_PRE_LIBS	= 
+X_EXTRA_LIBS	= 
+X_LIBS		= 
+
+LUA_LIBS	= 
+LUA_SRC		= 
+LUA_OBJ		= 
+LUA_CFLAGS	= 
+LUA_PRO		= 
+
+MZSCHEME_LIBS	= 
+MZSCHEME_SRC	= 
+MZSCHEME_OBJ	= 
+MZSCHEME_CFLAGS	= 
+MZSCHEME_PRO	= 
+MZSCHEME_EXTRA  = 
+MZSCHEME_MZC	= 
+
+PERL		= 
+PERLLIB		= 
+PERL_LIBS	= 
+SHRPENV		= 
+PERL_SRC	= 
+PERL_OBJ	= 
+PERL_PRO	= 
+PERL_CFLAGS	= 
+
+PYTHON_SRC	= 
+PYTHON_OBJ	= 
+PYTHON_CFLAGS	= 
+PYTHON_LIBS	= 
+PYTHON_CONFDIR	= 
+PYTHON_GETPATH_CFLAGS = 
+
+PYTHON3_SRC	= 
+PYTHON3_OBJ	= 
+PYTHON3_CFLAGS	= 
+PYTHON3_LIBS	= 
+PYTHON3_CONFDIR	= 
+
+TCL		= 
+TCL_SRC		= 
+TCL_OBJ		= 
+TCL_PRO		= 
+TCL_CFLAGS	= 
+TCL_LIBS	= 
+
+HANGULIN_SRC	= 
+HANGULIN_OBJ	= 
+
+WORKSHOP_SRC	= 
+WORKSHOP_OBJ	= 
+
+NETBEANS_SRC	= netbeans.c
+NETBEANS_OBJ	= objects/netbeans.o
+
+RUBY		= 
+RUBY_SRC	= 
+RUBY_OBJ	= 
+RUBY_PRO	= 
+RUBY_CFLAGS	= 
+RUBY_LIBS	= 
+
+SNIFF_SRC	= 
+SNIFF_OBJ	= 
+
+AWK		= awk
+
+STRIP		= strip
+
+EXEEXT		= 
+
+COMPILEDBY	= 
+
+INSTALLVIMDIFF	= installvimdiff
+INSTALLGVIMDIFF	= installgvimdiff
+INSTALL_LANGS	= install-languages
+INSTALL_TOOL_LANGS	= install-tool-languages
+
+### sed command to fix quotes while creating pathdef.c
+QUOTESED        = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
+
+### Line break character as octal number for "tr"
+NL		= "\\012"
+
+### Top directory for everything
+prefix		= /usr/local
+
+### Top directory for the binary
+exec_prefix	= ${prefix}
+
+### Prefix for location of data files
+BINDIR		= ${exec_prefix}/bin
+
+### For autoconf 2.60 and later (avoid a warning)
+datarootdir	= ${prefix}/share
+
+### Prefix for location of data files
+DATADIR		= ${datarootdir}
+
+### Prefix for location of man pages
+MANDIR		= ${datarootdir}/man
+
+### Do we have a GUI
+GUI_INC_LOC	= 
+GUI_LIB_LOC	= 
+GUI_SRC		= $(NONE_SRC)
+GUI_OBJ		= $(NONE_OBJ)
+GUI_DEFS	= $(NONE_DEFS)
+GUI_IPATH	= $(NONE_IPATH)
+GUI_LIBS_DIR	= $(NONE_LIBS_DIR)
+GUI_LIBS1	= $(NONE_LIBS1)
+GUI_LIBS2	= $(NONE_LIBS2)
+GUI_INSTALL	= $(NONE_INSTALL)
+GUI_TARGETS	= $(NONE_TARGETS)
+GUI_MAN_TARGETS	= $(NONE_MAN_TARGETS)
+GUI_TESTTARGET	= $(NONE_TESTTARGET)
+GUI_TESTARG	= $(NONE_TESTARG)
+GUI_BUNDLE	= $(NONE_BUNDLE)
+NARROW_PROTO	= 
+GUI_X_LIBS	= 
+MOTIF_LIBNAME	= 
+GTK_LIBNAME	= 
+
+### Any OS dependent extra source and object file
+OS_EXTRA_SRC	= os_macosx.m os_mac_conv.c
+OS_EXTRA_OBJ	= objects/os_macosx.o objects/os_mac_conv.o
+
+### If the *.po files are to be translated to *.mo files.
+MAKEMO		= 
+
+# Make sure that "make first" will run "make all" once configure has done its
+# work.  This is needed when using the Makefile in the top directory.
+first: all
--- a/src/auto/osdef.h	Sun Dec 19 03:22:37 2010 +0900
+++ b/src/auto/osdef.h	Sun Dec 19 22:21:24 2010 +0900
@@ -19,7 +19,7 @@
 #endif
 #ifdef HAVE_FSEEKO
 #endif
-#ifdef HAVE_FTELLO
+#ifdef HAVE_FSEEKO
 #endif
 #ifndef ferror	/* let me say it again: "macros should never have prototypes" */
 #endif
--- a/src/auto/pathdef.c	Sun Dec 19 03:22:37 2010 +0900
+++ b/src/auto/pathdef.c	Sun Dec 19 22:21:24 2010 +0900
@@ -2,9 +2,9 @@
 /* This file is automatically created by Makefile
  * DO NOT EDIT!  Change Makefile only. */
 #include "vim.h"
-char_u *default_vim_dir = (char_u *)"/Applications/Vim.app/Contents/Resources/vim";
+char_u *default_vim_dir = (char_u *)"/usr/local/share/vim";
 char_u *default_vimruntime_dir = (char_u *)"";
-char_u *all_cflags = (char_u *)"gcc -c -I. -Iproto -DHAVE_CONFIG_H -DFEAT_GUI_MAC -fno-common -fpascal-strings -Wall -Wno-unknown-pragmas -mdynamic-no-pic -pipe -I. -Iproto -DMACOS_X_UNIX -no-cpp-precomp -I/Developer/Headers/FlatCarbon  -g -O2        ";
-char_u *all_lflags = (char_u *)"gcc   -L/usr/local/lib -o Vim -framework Carbon      -lm -lncurses  -liconv        ";
-char_u *compiled_user = (char_u *)"one";
-char_u *compiled_sys = (char_u *)"zeus.cr.ie.u-ryukyu.ac.jp";
+char_u *all_cflags = (char_u *)"gcc -c -I. -Iproto -DHAVE_CONFIG_H   -DMACOS_X_UNIX -no-cpp-precomp  -O2 -fno-strength-reduce -Wall -D_FORTIFY_SOURCE=1     ";
+char_u *all_lflags = (char_u *)"gcc   -L/usr/local/lib -o vim       -lm -lncurses  -liconv -framework Cocoa          ";
+char_u *compiled_user = (char_u *)"jersey";
+char_u *compiled_sys = (char_u *)"nw0840.st.ie.u-ryukyu.ac.jp";