X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2FMakefile.in.in;h=733b02aaf726a6b45da3da2a4ac262ca7f67ebb1;hb=170dcc3172bcd984e972e7be768959ea0f884f1e;hp=4e868173085d7330248620c8e065dedf017ecb55;hpb=3062d425fac0473eb5aa2efc0bb002f6ce0cb028;p=chise%2Fxemacs-chise.git.1 diff --git a/src/Makefile.in.in b/src/Makefile.in.in index 4e86817..733b02a 100644 --- a/src/Makefile.in.in +++ b/src/Makefile.in.in @@ -53,6 +53,7 @@ RECURSIVE_MAKE=@RECURSIVE_MAKE@ SHELL=/bin/sh RM = rm -f +TAR = tar lispdir = ${srcdir}/../lisp/ moduledir = ${srcdir}/../modules/ @@ -141,13 +142,20 @@ sheap_objs=sheap.o win32_objs=win32.o xemacs_res.o #endif +#ifdef HAVE_SETITIMER +profile_objs=profile.o +#endif + ## -Demacs is needed to make some files produce the correct version ## for use in Emacs. cppflags = $(CPPFLAGS) -Demacs -I. $(c_switch_all) cflags = $(CFLAGS) $(cppflags) #if defined (WIN32_NATIVE) || defined (CYGWIN) -ldflags = $(LDFLAGS) -mwindows $(ld_switch_all) $(ld_dynamic_link_flags) +ldflags = $(LDFLAGS) -mwindows -e _mainCRTStartup $(ld_switch_all) $(ld_dynamic_link_flags) +# if defined (CYGWIN) +ldflags += -Wl,--script=s/cygwin.sc +# endif #else ldflags = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags) #endif @@ -194,7 +202,7 @@ objs=\ gui.o gutter.o $(gui_objs) hash.o imgproc.o indent.o insdel.o intl.o\ keymap.o $(RTC_patch_objs) line-number.o lread.o lstream.o\ macros.o marker.o md5.o minibuf.o objects.o opaque.o\ - print.o process.o profile.o\ + print.o process.o $(profile_objs)\ rangetab.o redisplay.o redisplay-output.o regex.o\ search.o select.o $(sheap_objs) signal.o sound.o\ specifier.o strftime.o symbols.o syntax.o sysdep.o\ @@ -758,8 +766,8 @@ install: ${PROGNAME} done; \ test -d s && hdrtars="$$hdrtars s/*"; \ test -d m && hdrtars="$$hdrtars m/*"; \ - test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ - (cd ${archlibdir}/include && umask 022 && tar xf -); \ + test -n "$$hdrtars" && (${TAR} cf - $$hdrtars) | \ + (cd ${archlibdir}/include && umask 022 && ${TAR} xf -); \ chmod 755 ${archlibdir}/include; \ test -d ${archlibdir}/include/s && \ chmod 755 ${archlibdir}/include/s; \