XEmacs 21.4.4 "Artificial Intelligence".

[chise/xemacs-chise.git.1] / src / Makefile.in.in

diff --git a/src/Makefile.in.in b/src/Makefile.in.in
index f6e2be0..43381b7 100644 (file)
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -31,11 +31,10 @@ PROGNAME=@PROGNAME@
 #ifdef PDUMP
 DUMP_TARGET = ${PROGNAME}.dmp
 EXE_TARGET  = ${PROGNAME}
-ID_FILE     = dump-id.c
+DUMP_ID     = dump-id.o
 #else
 DUMP_TARGET = ${PROGNAME}
 EXE_TARGET  = temacs
-ID_FILE     =
 #endif
 
 all: ${DUMP_TARGET}
@@ -54,6 +53,7 @@ RECURSIVE_MAKE=@RECURSIVE_MAKE@
 
 SHELL=/bin/sh
 RM = rm -f
+TAR = tar
 
 lispdir = ${srcdir}/../lisp/
 moduledir = ${srcdir}/../modules/
@@ -147,7 +147,11 @@ win32_objs=win32.o xemacs_res.o
 
 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)
+#else
 ldflags  = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags)
+#endif
 
 #ifdef SOLARIS2
 %.o : %.c
@@ -387,7 +391,7 @@ ${libsrc}DOC: ${EXE_TARGET} update-elc.stamp
        $(RM) ${libsrc}DOC; \
        ${DUMPENV} ./${EXE_TARGET} -nd -batch -l ${srcdir}/../lisp/make-docfile.el -- \
                -o ${libsrc}DOC -d ${srcdir} -i ${libsrc}../site-packages \
-               ${obj_src} ${mallocdocsrc} ${rallocdocsrc}
+               ${obj_src} ${mallocdocsrc} ${rallocdocsrc} ${extra_doc_files}
 
 dump_elcs: dump-elcs
 
@@ -446,12 +450,11 @@ link_deps=\
  $(start_files) ${objs} ${otherobjs}\
  $(lwlib_deps) $(dynodump_deps)
 
-temacs_deps=\
- $(link_deps) $(ID_FILE)
+temacs_deps = $(link_deps) ${DUMP_ID}
 
 temacs_link_args=\
- ${start_flags} ${ldflags} -I${srcdir} \
- -o $@ ${start_files} ${objs} ${otherobjs} ${ID_FILE} ${LIBES}
+ ${start_flags} ${ldflags}\
+ -o $@ ${start_files} ${objs} ${otherobjs} ${DUMP_ID} ${LIBES}
 
 ${EXE_TARGET}: $(temacs_deps)
        $(LD) $(temacs_link_args)
@@ -508,14 +511,14 @@ debug-temacs: ${EXE_TARGET}
 ##
 ## Purify
 PURIFY_PROG  = purify
+PURIFY_LIBS  =
 PURIFY_FLAGS =\
 #ifdef PDUMP
  -search-mmaps=yes\
 #endif
- -chain-length=32 -ignore-signals=SIGPOLL -threads=yes\
- -cache-dir=${srcdir}/purecache -always-use-cache-dir=yes
+ -chain-length=32 -ignore-signals=SIGPOLL\
+ -cache-dir=${blddir}/purecache -always-use-cache-dir=yes
 
-PURIFY_LIBS  = -lpthread
 puremacs: $(temacs_deps)
        $(PURIFY_PROG) $(PURIFY_FLAGS) $(LD) $(temacs_link_args) $(PURIFY_LIBS)
        cp $@ ${EXE_TARGET}
@@ -698,6 +701,14 @@ hpplay.o: ${srcdir}/hpplay.c
        $(CC) -c -Demacs $(sound_cflags) $(cflags) ${srcdir}/hpplay.c
 #endif /* HAVE_NATIVE_SOUND */
 
+#if defined(HAVE_GLADE_GLADE_H) || defined(HAVE_GLADE_H)
+glade_files=glade.c
+#endif
+
+#ifdef HAVE_GTK
+extra_doc_files=emacs-widget-accessors.c ui-byhand.c $(glade_files)
+#endif
+
 xemacs_res.o: ${srcdir}/../nt/xemacs.rc
        windres --include-dir ${srcdir}/../nt -i ${srcdir}/../nt/xemacs.rc -o $@
 
@@ -741,15 +752,15 @@ install: ${PROGNAME}
        cd ${srcdir}; hdrdir2=`pwd`; cd $$hdir; \
        test "$$hdrdir2" != "$$hdir" && hdir="$$hdir $$hdrdir2"; \
        (for thisdir in $$hdir; do \
-               cd $$hdir && \
+               cd $$thisdir && \
                (hdrtars=; \
                for hdrfile in *.h; do \
                        hdrtars="$$hdrtars $$hdrfile"; \
                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; \