1. 20 May, 2010 1 commit
    • Glenn Morris's avatar
      Handle auto-depend with configure. · 9d5cf9b6
      Glenn Morris authored
      * make-dist (src): Include *.mk.
      * config.bat: Concatenate deps.mk onto the end of src/Makefile.
      * configure.in (DEPFLAGS, MKDEPDIR): New output variables.
      (deps_frag): New output file.
      (AUTO_DEPEND): Remove this definition.
      
      * src/Makefile.in (DEPDIR): New constant.
      (DEPFLAGS): Set with configure, not cpp.
      (MKDEPDIR): New, set by configure.
      (.c.o, .m.o, ecrt0.o): Use $MKDEPDIR.
      (clean): Use $DEPDIR.
      (deps_frag): Include from configure.
      Move static/dynamic dependency stuff to deps.mk/autodeps.mk.
      * src/deps.mk, src/autodeps.mk: New files, extracted from Makefile.in.
      
      * msdos/sed1v2.inp (DEPFLAGS, deps_frag): Edit to empty.
      (MKDEPDIR): Edit to ':'.
      9d5cf9b6
  2. 19 May, 2010 2 commits
    • Glenn Morris's avatar
      Minor msdos build change. · d494e8f2
      Glenn Morris authored
      * msdos/sed2v2.inp (ORDINARY_LINK): Set here rather than in s/msdos.h.
      * src/s/msdos.h (ORDINARY_LINK): Move to sed2v2.inp.
      d494e8f2
    • Glenn Morris's avatar
      Set linker-related things with configure. · c1d0dcfd
      Glenn Morris authored
      * configure.in (LINKER, YMF_PASS_LDFLAGS): New output variables.
      (ORDINARY_LINK): New AC_DEFINE.
      (LIB_GCC): No need to set if ORDINARY_LINK.
      
      * src/Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp.
      (GNULIB_VAR): Remove.
      (LIBES): Use LIB_GCC instead of GNULIB_VAR.
      
      * src/m/ibms390x.h (LINKER):
      * src/m/macppc.h (LINKER) [GNU_LINUX]:
      * src/s/aix4-2.h (ORDINARY_LINK):
      * src/s/cygwin.h (LINKER):
      * src/s/darwin.h (ORDINARY_LINK):
      * src/s/gnu.h (ORDINARY_LINK):
      * src/s/netbsd.h (LINKER):
      * src/s/usg5-4.h (ORDINARY_LINK):
      Move to configure.
      
      * msdos/sed1v2.inp (LD): Edit to $(CC).
      (YMF_PASS_LDFLAGS): Edit to `flags'.
      c1d0dcfd
  3. 18 May, 2010 3 commits
    • Eli Zaretskii's avatar
      msdos/sed1x.inp: Add copyright notice. · 952d5580
      Eli Zaretskii authored
      952d5580
    • Glenn Morris's avatar
      Set rallocobj with configure, not cpp. · 40dc6bf4
      Glenn Morris authored
      * configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC.
      (RALLOC_OBJ): New output variable.
      * config.bat (RALLOC_OBJ): Edit to empty if sys_malloc.
      
      * src/Makefile.in (RALLOC_OBJ): New, set by configure.
      (rallocobj): Replace with the previous variable.
      (otherobj): Use $RALLOC_OBJ.
      
      * src/s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]:
      * src/s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure.
      
      * msdos/sed1v2.inp (RALLOC_OBJ): Edit to ralloc.o.
      40dc6bf4
    • Glenn Morris's avatar
      Define some malloc objects with configure, not cpp. · be4ff9da
      Glenn Morris authored
      * configure.in (GMALLOC_OBJ, VMLIMIT_OBJ): New output variables.
      * config.bat (GMALLOC_OBJ, VMLIMIT_OBJ): Edit to empty if sys_malloc.
      
      * src/Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
      (gmallocobj, vmlimitobj): Replace with previous two variables.
      (otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.
      
      * msdos/sed1v2.inp (GMALLOC_OBJ): Edit to gmalloc.o.
      (VMLIMIT_OBJ): Edit to vm-limit.o.
      be4ff9da
  4. 17 May, 2010 1 commit
    • Glenn Morris's avatar
      Combine the two stamp-oldxmenu cases. · 16455a85
      Glenn Morris authored
      * configure.in (OLDXMENU_DEPS): New output variable.
      * configure: Regenerate.
      
      * src/Makefile.in (OLDXMENU_DEPS): New, set by configure.
      (stamp-oldxmenu): Use $OLDXMENU_DEPS.
      
      * msdos/sed1v2.inp (OLDXMENU_DEPS): Edit to empty.
      * msdos/sed1x.inp (OLDXMENU_DEPS): Edit to ${OLDXMENU} ../src/${OLDXMENU}.
      16455a85
  5. 16 May, 2010 2 commits
    • Glenn Morris's avatar
      Simplify temacs build rule. · b02a6645
      Glenn Morris authored
      * configure.in (TEMACS_LDFLAGS2): New output variable.
      * configure: Regenerate.
      
      * msdos/sed1v2.inp (TEMACS_LDFLAGS2): Edit to $(LDFLAGS).
      
      * src/Makefile.in (TEMACS_LDFLAGS2): New, set by configure.
      (temacs${EXEEXT}): Combine the NS_IMPL_GNUSTEP case with the default.
      b02a6645
    • Glenn Morris's avatar
      Simplify temacs build rule. · 8877ca0f
      Glenn Morris authored
      * configure.in (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New output variable.
      (START_FILES): Set to empty if NS_IMPL_GNUSTEP.
      (GNUSTEP_SYSTEM_HEADERS, GNUSTEP_SYSTEM_LIBRARIES): Do not output,
      nothing uses.
      
      * configure: Regenerate.
      
      * src/Makefile.in (GNUSTEP_SYSTEM_LIBRARIES): Remove, unused.
      (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): New, set by configure.
      (LD) [NS_IMPL_GNUSTEP]: Set to $(CC) -rdynamic.
      (temacs${EXEEXT}): Remove $LOCALCPP, never defined or referenced.
      Make most of the NS_IMPL_GNUSTEP case the same as the default case.
      
      * msdos/sed1v2.inp (GNUSTEP_SYSTEM_LIBRARIES): Remove.
      (NS_IMPL_GNUSTEP_TEMACS_LDFLAGS): Edit to empty.
      8877ca0f
  6. 15 May, 2010 8 commits
  7. 14 May, 2010 5 commits
    • Glenn Morris's avatar
      No harm in always defining some ns_ Makefile variables. · 177b0288
      Glenn Morris authored
      * src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Always define.
      
      * msdos/sed1v2.inp (ns_appdir, ns_appbindir, ns_appsrc): Edit to empty.
      177b0288
    • Glenn Morris's avatar
      Replace some msdos cpp. · f14d1dfd
      Glenn Morris authored
      * src/Makefile.in (MSDOS_OBJ): Default to empty, let msdos scripts set it.
      (MSDOS_X_OBJ): New variable.
      (MSDOS_SUPPORT_REAL): New constant.
      (MSDOS_SUPPORT): Set as a variable, not with cpp.
      (obj): Use MSDOS_X_OBJ.
      (lisp): Use MSDOS_SUPPORT as a variable.
      
      * msdos/sed1v2.inp (MSDOS_OBJ): Edit to dosfns.o msdos.o.
      (MSDOS_SUPPORT): Edit to $(MSDOS_SUPPORT_REAL).
      * msdos/sed1x.inp (MSDOS_X_OBJ): Edit to w16select.o termcap.o.
      f14d1dfd
    • Glenn Morris's avatar
      Define MOUSE_, TOOLTIP_, WINDOW_SUPPORT with configure. · 11842bd8
      Glenn Morris authored
      * configure.in (GPM_MOUSE_SUPPORT): Remove.
      (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): New output variables.
      (HAVE_WINDOW_SYSTEM, HAVE_MOUSE): Move out of AC_BOTTOM.
      
      * src/Makefile.in (REAL_MOUSE_SUPPORT): New constant.
      (GPM_MOUSE_SUPPORT): Now it's a constant.
      (MOUSE_SUPPORT, TOOLTIP_SUPPORT, WINDOW_SUPPORT): Set with configure, not cpp.
      
      * msdos/sed2x.inp (HAVE_WINDOW_SYSTEM): Define.
      * msdos/sed1x.inp (TOOLTIP_SUPPORT): Edit to ${lispsource}tooltip.elc.
      (WINDOW_SUPPORT): Edit to $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT).
      * msdos/sed1v2.inp (MOUSE_SUPPORT): Edit to $(REAL_MOUSE_SUPPORT).
      (TOOLTIP_SUPPORT, WINDOW_SUPPORT): Edit to empty.
      11842bd8
    • Glenn Morris's avatar
      * msdos/sed1v2.inp (FONT_OBJ): Use the plain X version (no XFT, Freetype). · 2633ef94
      Glenn Morris authored
      Hopefully this is the right thing for msdos with X.
      2633ef94
    • Glenn Morris's avatar
      Minor build simplification for NS. · 489d31a4
      Glenn Morris authored
      * configure.in (NS_IMPL_GNUSTEP_INC): New output variable.
      (GNUSTEP_MAKEFILES): Do not output.
      
      * src/Makefile.in (@NS_IMPL_GNUSTEP_INC@): Use in place of #ifdef.
      
      * msdos/sed1v2.inp (@NS_IMPL_GNUSTEP_INC@): Edit to nil.
      489d31a4
  8. 13 May, 2010 2 commits
    • Glenn Morris's avatar
      Some msdos build fixes (hopefully, possibly, ...) · 99ab9eb4
      Glenn Morris authored
      * msdos/sed1x.inp (OLDXMENU): Edit to ${oldXMenudir}libXMenu11.a.
      (LIBXMENU): Edit to ${OLDXMENU}.
      (LIBX_OTHER): Edit to ${LIBXT} ${LIBX_EXTRA}.
      99ab9eb4
    • Glenn Morris's avatar
      Define some variables to hold configure's output, for clarity. · 5a903aa9
      Glenn Morris authored
      * src/Makefile.in (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
      (LIB_MATH, FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS)
      (FREETYPE_LIBS, LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS)
      (M17N_FLT_LIBS, GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBGPM)
      (LIBRESOLV, UNEXEC_OBJ): For clarity, define variables to hold
      the values output be configure.
      (ALL_CFLAGS, obj, LIBES, temacs${EXEEXT}): Use the above variables.
      
      * msdos/sed1v2.inp (C_SWITCH_X_SYSTEM, C_SWITCH_X_SITE, LIB_STANDARD)
      (FONTCONFIG_CFLAGS, FONTCONFIG_LIBS, FREETYPE_CFLAGS, FREETYPE_LIBS)
      (LIBOTF_CFLAGS, LIBOTF_LIBS, M17N_FLT_CFLAGS, M17N_FLT_LIBS)
      (GNU_OBJC_CFLAGS, GNUSTEP_SYSTEM_LIBRARIES, LIBRESOLV, LIBGPM):
      Edit to empty,
      (LIB_MATH): Edit to -lm.
      (UNEXEC_OBJ): Edit to unexec.o.
      5a903aa9
  9. 12 May, 2010 2 commits
    • Glenn Morris's avatar
      Remove unused output variable LIB_SRC_EXTRA_INSTALLABLES. · 44b031a6
      Glenn Morris authored
      * configure.in (LIB_SRC_EXTRA_INSTALLABLES): Remove, unused.
      
      * lib-src/Makefile.in (INSTALLABLES): Remove @LIB_SRC_EXTRA_INSTALLABLES@.
      
      * msdos/sed3v2.inp (INSTALLABLES): No more @LIB_SRC_EXTRA_INSTALLABLES@.
      44b031a6
    • Glenn Morris's avatar
      Move LIB_GCC from cpp to configure. · 1a0d7c06
      Glenn Morris authored
      * configure.in (LIB_GCC): New output variable.
      
      * src/Makefile.in (LIB_GCC): Set using configure, not cpp.
      (GNULIB_VAR) [!ORDINARY_LINK]: Always set to $LIB_GCC.
      * src/m/arm.h (LIB_GCC) [GNU_LINUX]:
      * src/s/cygwin.h (LIB_GCC):
      * src/s/freebsd.h (LIB_GCC):
      * src/s/gnu-linux.h (LIB_GCC):
      * src/s/msdos.h (LIB_GCC):
      * src/s/netbsd.h (LIB_GCC):
      Move to configure.
      
      * msdos/sed1v2.inp (LIB_GCC): Edit to -Lgcc.
      1a0d7c06
  10. 11 May, 2010 1 commit
    • Glenn Morris's avatar
      On msdos, set LIBS_SYSTEM with config.bat, not cpp. · acddf8ae
      Glenn Morris authored
      * config.bat [HAVE_X11]: Run sed3x.inp on lib-src/Makefile.
      
      * src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
      * src/s/msdos.h (MSDOS_LIBS_SYSTEM): Remove.
      
      * msdos/sed1x.inp (LIBS_SYSTEM): Edit to -lxext -lsys.
      * msdos/sed3x.inp: New file.
      
      * lib-src/Makefile.in (LIBS_SYSTEM) [MSDOS]: Do not reset.
      (config.h) [MSDOS]: Do not include.
      acddf8ae
  11. 10 May, 2010 2 commits
    • Glenn Morris's avatar
      Move LIBS_SYSTEM from cpp to configure. · 97efb629
      Glenn Morris authored
      * configure.in (LIBS_SYSTEM): New output variable, replacing cpp.
      
      * lib-src/Makefile.in (LIBS_SYSTEM) [!MSDOS]: Set with configure, not cpp.
      (LIBS_SYSTEM) [MSDOS]: Use MSDOS_LIBS_SYSTEM.
      (NOT_C_CODE): Remove, no longer used.
      (config.h) [!MSDOS]: No longer include.
      (LOADLIBES): Use LIBS_SYSTEM as a variable.
      
      * src/Makefile.in (LIBS_SYSTEM): Set using configure, not cpp.
      (LIBS_SYSTEM) [MSDOS]: Reset with MSDOS_LIBS_SYSTEM.
      (LIBES): Use LIBS_SYSTEM as a variable.
      * src/s/msdos.h (LIBS_SYSTEM): Rename to MSDOS_LIBS_SYSTEM.  Always define.
      * src/s/aix4-2.h (LIBS_SYSTEM):
      * src/s/freebsd.h (LIBS_SYSTEM):
      * src/s/hpux10-20.h (LIBS_SYSTEM):
      * src/s/sol2-6.h (LIBS_SYSTEM):
      * src/s/unixware.h (LIBS_SYSTEM):
      Move to configure.
      
      * msdos/sed1v2.inp, msdos/sed3v2.inp (LIBS_SYSTEM): Edit to empty.
      97efb629
    • Glenn Morris's avatar
      Move MAIL_USE_FLOCK, MAIL_USE_LOCKF, BLESSMAIL_TARGET from cpp to configure. · 7490175b
      Glenn Morris authored
      * configure.in (MAIL_USE_FLOCK, MAIL_USE_LOCKF): New AC_DEFINEs.
      (BLESSMAIL_TARGET): New output variable.
      
      * lib-src/Makefile.in (BLESSMAIL_TARGET): Set with configure, not cpp.
      
      * src/s/aix4-2.h (MAIL_USE_LOCKF):
      * src/s/bsd-common.h (MAIL_USE_FLOCK):
      * src/s/darwin.h (MAIL_USE_FLOCK):
      * src/s/gnu-linux.h (MAIL_USE_FLOCK):
      * src/s/irix6-5.h (MAIL_USE_FLOCK):
      * src/s/template.h (MAIL_USE_FLOCK):
      Move to configure.
      
      * src/s/ms-w32.h: Comment.
      
      * msdos/sed3v2.inp (BLESSMAIL_TARGET): Edit to need-blessmail.
      7490175b
  12. 08 May, 2010 2 commits
    • Chong Yidong's avatar
      Bump version to 23.2. · 61a808e8
      Chong Yidong authored
      61a808e8
    • Glenn Morris's avatar
      Move TERMINFO, LIBS_TERMCAP from cpp to configure. · 40c17879
      Glenn Morris authored
      * configure.in (HAVE_LIBNCURSES): New local variable.
      (TERMINFO, LIBS_TERMCAP, TERMCAP_OBJ): New output variables,
      replacing cpp in src/s/*.h and src/Makefile.in.
      
      * src/Makefile.in (LIBS_TERMCAP): Set with configure, not cpp.
      (TERMCAP_OBJ): New, set by configure, replacing termcapobj.
      (termcapobj): Replace with TERMCAP_OBJ.
      (otherobj): Use $TERMCAP_OBJ instead of $termcapobj.
      (LIBES): Use LIBS_TERMCAP as a variable.
      
      * src/s/freebsd.h (osreldate.h): No longer include, since this file
      does not use __FreeBSD_version any more.
      
      * srs/s/aix4-2.h (TERMINFO):
      * srs/s/cygwin.h (TERMINFO):
      * srs/s/darwin.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
      * srs/s/freebsd.h (TERMINFO, LIBS_TERMCAP):
      * srs/s/gnu-linux.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
      * srs/s/gnu.h (TERMINFO, LIBS_TERMCAP) [HAVE_LIBNCURSES]:
      * srs/s/hpux10-20.h (TERMINFO, LIBS_TERMCAP):
      * srs/s/irix6-5.h (TERMINFO):
      * srs/s/netbsd.h (LIBS_TERMCAP):
      * srs/s/openbsd.h (TERMINFO, LIBS_TERMCAP):
      * srs/s/sol2-6.h (LIBS_TERMCAP) [!TERMINFO]:
      * srs/s/usg5-4.h (TERMINFO):
      Move to configure.
      
      * msdos/sed1v2.inp (LIBS_TERMCAP): Edit to empty.
      (TERMCAP_OBJ): Edit to tparam.o.
      
      * admin/CPP-DEFINES (LIBS_TERMCAP, TERMINFO): Remove.
      40c17879
  13. 07 May, 2010 1 commit
    • Eli Zaretskii's avatar
      Fix MS-DOS configuring in lib-src/ and src/, broken by autoconfiscation. · 9fdec8bc
      Eli Zaretskii authored
       src/Makefile.in: Don't use Make-style comments past the "start of
       cpp stuff" line.
       (MSDOS_OBJ): Remove xmenu.o (it is now defined by XMENU_OBJ).
       src/s/msdos.h (UNEXEC): Don't define (@unexec@ in Makefile.in is
       edited directly by msdos/sed1v2.inp).
       msdos/sed3v2.inp (C_SWITCH_MACHINE): Edit to empty.
       msdos/sed1v2.inp (@LIB_MATH@): Edit to -lm.
       (C_SWITCH_MACHINE, C_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_TEMACS)
       (LD_SWITCH_X_SITE_AUX, LD_SWITCH_X_SITE_AUX_RPATH)
       (LD_SWITCH_SYSTEM, LD_SWITCH_SYSTEM_EXTRA, LIBTIFF, LIBJPEG)
       (LIBPNG, LIBGIF, LIBXPM, XFT_LIBS, DBUS_CFLAGS, DBUS_LIBS)
       (DBUS_OBJ, GCONF_CFLAGS, GCONF_LIBS, GTK_OBJ, LIBXMU, LIBXSM)
       (LIBXTR6, XOBJ, TOOLKIT_LIBW, WIDGET_OBJ, CYGWIN_OBJ, NS_OBJ)
       (NS_SUPPORT, LIBSELINUX_LIBS, START_FILES): Edit to empty.
       (XMENU_OBJ): Edit to xmenu.o.
       (FONT_OBJ): Edit to value used for X on Unix.
       (PRE_ALLOC_OBJ): Edit to lastfile.o.
       (POST_ALLOC_OBJ): Edit to $(vmlimitobj).
       (@unexec@): Edit to unexec.o.
      9fdec8bc
  14. 06 May, 2010 1 commit
    • Glenn Morris's avatar
      Remove some unused Makefile.in variables. · e3cf0cde
      Glenn Morris authored
      * configure.in (AC_PROG_LN_S): Remove test, nothing uses @LN_S@.
      
      * Makefile.in (CPP, C_SWITCH_SYSTEM, ALLOCA, LN_S, C_SWITCH_X_SITE)
      (LD_SWITCH_X_SITE): Remove unused variables.
      
      * lwlib/Makefile.in (CPP, LN_S, TOP, LN): Remove unused variables.
      
      * oldXMenu/Makefile.in (CPP, LN_S, AS, LD, MV, LS, LINTOPTS, LINTLIBFLAG, MAKE)
      (STD_DEFINES, CDEBUGFLAGS, RM_CMD): Remove unused variables.
      
      * src/Makefile.in (CPP, LN_S): Remove unused variables.
      
      * msdos/sed1v2.inp, msdos/sed5x.inp: Remove LN_S, unused.
      e3cf0cde
  15. 02 Apr, 2010 1 commit
  16. 01 Apr, 2010 1 commit
    • Eli Zaretskii's avatar
      Remove support for DJGPP v1.x (bug#5813). · ed68db4d
      Eli Zaretskii authored
       src/:
       w16select.c (__dpmi_int): Remove DJGPP v1.x compatibility.
       s/msdos.h: 
       unexec.c (make_hdr, copy_text_and_data): 
       sysdep.c (wait_for_termination, sys_subshell): 
       msdos.c (dos_set_window_size, msdos_set_cursor_shape)
       (IT_set_terminal_modes): 
       (__write, _rename, gethostname, gettimeofday, alarm, fork, kill)
       (dos_ttraw, dos_ttcooked, run_msdos_command, abort): Remove DJGPP
       v1.x code and tests of the value of __DJGPP__.
       (nice, pause, sigsetmask, sigblock): Remove DJGPP v1.x
       compatibility code.
       lread.c: 
       gmalloc.c (memalign): 
       fileio.c (Fcopy_file, check_executable, Ffile_modes): 
       emacs.c (main): 
       dosfns.c (init_dosfns): 
       dired.c (file_name_completion_stat): Remove tests of __DJGPP__.
      
       msdos/:
       sed3.inp:
       sed2.inp:
       sed1.inp:
       mainmake: Files removed.
      ed68db4d
  17. 27 Mar, 2010 1 commit
    • Eli Zaretskii's avatar
      Fix the MSDOS build as fallout from the latest Makefile.in changes. · 2201e7e2
      Eli Zaretskii authored
       config.bat <lib-src>: Edit out lines that begin with several #
       characters.
      
       msdos/sedlisp.inp (VPATH): Don't edit, no longer needed.
       (lisp, srcdir): Adapt to lisp/Makefile.in changes.
       (abs_top_builddir): New edit.
       msdos/sed3v2.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
       (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
       msdos/sed3.inp (KRB4LIB, DESLIB, KRB5LIB, CRYPTOLIB, COM_ERRLIB)
       (LIBHESIOD, LIBRESOLV, LIBS_MAIL): Edit to empty values.
       msdos/sed1v2.inp (abs_builddir): Edit into "../src".
      2201e7e2
  18. 10 Mar, 2010 1 commit
  19. 19 Feb, 2010 1 commit
  20. 13 Jan, 2010 1 commit
  21. 17 Sep, 2009 1 commit