X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=Makefile.in.in;h=47d386a9662fdf97c76e78dbb5ebcd5b1821c377;hb=b9a7b71784d4831c06df5a7a38eaf6a02380775d;hp=cb7100226541a2bfc99eb188d56d177c5380c6fa;hpb=2fd9701a4f902054649dde9143a3f77809afee8f;p=chise%2Fxemacs-chise.git.1 diff --git a/Makefile.in.in b/Makefile.in.in index cb71002..47d386a 100644 --- a/Makefile.in.in +++ b/Makefile.in.in @@ -74,6 +74,7 @@ CPP=@CPP@ LN_S=@LN_S@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ +LDFLAGS=@LDFLAGS@ ## These help us choose version- and architecture-specific directories ## to install files in. @@ -123,7 +124,6 @@ pkgdir=@pkgdir@ ## Where to install and expect the files that XEmacs modifies as it runs. ## These files are all architecture-independent. Right now, the ## only such data is the locking directory; -## ${lockdir} is a subdirectory of this. statedir=@statedir@ ## Where to install and expect executable files to be run by XEmacs @@ -199,11 +199,6 @@ buildlispdir=${srcdir}/lisp ## at once. etcdir=@etcdir@ -## Where to create and expect the locking directory, where -## the XEmacs locking code keeps track of which files are -## currently being edited. -lockdir=@lockdir@ - ## Where to put the DOC file. docdir=@docdir@ @@ -245,8 +240,13 @@ INSTALL_ARCH_DEP_SUBDIR = @INSTALL_ARCH_DEP_SUBDIR@ ## When installing the info files, we need to do special things to ## avoid nuking an existing dir file, so we don't do that here; ## instead, we have written out explicit code in the `install' targets. +#ifdef HAVE_CHISE_CLIENT +COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/lib-src/char-db +COPYDESTS = ${etcdir} ${lispdir} ${archlibdir}/char-db +#else COPYDIR = ${srcdir}/etc ${srcdir}/lisp COPYDESTS = ${etcdir} ${lispdir} +#endif GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h GENERATED_LISP = lisp/finder-inf.el @@ -283,39 +283,52 @@ ${srcdir}/configure : ${srcdir}/configure.in ${srcdir}/lib-src/config.values.in : ${srcdir}/configure cd ${srcdir} && $(SHELL) lib-src/config.values.sh -depend ${srcdir}/src/depend : - cd ${srcdir}/src && $(RECURSIVE_MAKE) depend +depend ${srcdir}/src/depend: + cd ./src && $(RECURSIVE_MAKE) depend ## Build XEmacs and recompile out-of-date and missing .elc files along ## the way. -all-elc all-elcs: lib-src lwlib dump-elcs src - MAKE='$(MAKE)' EMACS='./src/$(PROGNAME)' $(SHELL) ${srcdir}/lib-src/update-elc.sh +all-elc all-elcs: autoloads dump-elcs + ${blddir}/src/${PROGNAME} -batch -vanilla \ + -l update-elc-2.el -f batch-update-elc-2 lisp +#ifdef UTF2000 + ${blddir}/src/${PROGNAME} -batch -vanilla \ + -l update-elc-2.el -f batch-update-elc-2 lisp/utf-2000 +#endif ## Sub-target for all-elc. dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs cd ./src && $(RECURSIVE_MAKE) dump-elcs -autoloads: lisp/auto-autoloads.el lisp/custom-load.el +autoloads: lib-src lwlib src lisp/auto-autoloads.el lisp/custom-load.el FRC.lisp.auto.autoloads.el: lisp/auto-autoloads.el: FRC.lisp.auto.autoloads.el - rm -f lisp/auto-autoloads.el - ${blddir}/src/${PROGNAME} -batch -vanilla \ + $(RM) lisp/auto-autoloads.el + ${blddir}/src/${PROGNAME} -batch -no-autoloads \ -l autoload -f batch-update-directory lisp ${blddir}/src/${PROGNAME} -batch -vanilla \ -f batch-byte-compile lisp/auto-autoloads.el - @rm -f lisp/auto-autoloads.el~ + @$(RM) lisp/auto-autoloads.el~ #ifdef MULE - rm -f lisp/mule/auto-autoloads.el + $(RM) lisp/mule/auto-autoloads.el ${blddir}/src/${PROGNAME} -batch -vanilla \ -l autoload -f batch-update-directory lisp/mule ${blddir}/src/${PROGNAME} -batch -vanilla \ -f batch-byte-compile lisp/mule/auto-autoloads.el - @rm -f lisp/mule/auto-autoloads.el~ + @$(RM) lisp/mule/auto-autoloads.el~ +#endif +#ifdef UTF2000 + $(RM) lisp/utf-2000/auto-autoloads.el + ${blddir}/src/${PROGNAME} -batch -vanilla \ + -l autoload -f batch-update-directory lisp/utf-2000 + ${blddir}/src/${PROGNAME} -batch -vanilla \ + -f batch-byte-compile lisp/utf-2000/auto-autoloads.el + @$(RM) lisp/utf-2000/auto-autoloads.el~ #endif FRC.lisp.custom.load.el: -lisp/custom-load.el: FRC.lisp.custom.load.el +lisp/custom-load.el: FRC.lisp.custom.load.el lisp/auto-autoloads.el ${blddir}/src/${PROGNAME} -batch -vanilla -l cus-dep \ -f Custom-make-dependencies lisp @@ -439,18 +452,18 @@ install-arch-dep: mkdir #ifdef PDUMP ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp #endif -#ifdef WINDOWSNT +#ifdef WIN32_NATIVE ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -chmod 0755 ${bindir}/${PROGNAME} #else ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} -chmod 0755 ${bindir}/${PROGNAME}-${version} -# ifdef __CYGWIN32__ +# ifdef CYGWIN cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} # else cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -# endif /* __CYGWIN32__ */ -#endif /* WINDOWSNT */ +# endif /* CYGWIN */ +#endif /* WIN32_NATIVE */ if test "${prefix}" != "${exec_prefix}"; then \ $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ for dir in \ @@ -519,10 +532,9 @@ gzip-el: ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. mkdir: FRC.mkdir - ${MAKEPATH} ${COPYDESTS} ${lockdir} ${docdir} ${infodir} ${archlibdir} \ + ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \ ${sitelispdir} ${moduledir} ${sitemoduledir} - -chmod 0777 ${lockdir} ## Delete all the installed files that the `install' target would ## create (but not the noninstalled files such as `make all' would