1. 21 May, 2010 5 commits
    • Glenn Morris's avatar
      Minor Makefile fix. · c468346e
      Glenn Morris authored
      * src/Makefile.in (temacs${EXEEXT}, prefix-args, mostlyclean):
      prefix-args neither gets nor needs the $EXEEXT extension.
      c468346e
    • Glenn Morris's avatar
      a078530e
    • Glenn Morris's avatar
      Handle some HAVE_NS Makefile conditionals with configure. · 66dbf213
      Glenn Morris authored
      * configure.in (ns_frag): New output file.
      
      * src/Makefile.in (${ns_appdir}, ${ns_appbindir}Emacs, ns-app):
      Move these rules to ns.mk.
      * ns.mk: New file.  Copyright years based on date of nextstep merge.
      
      * msdos/sed1v2.inp(@ns_frag@): Edit to nothing.
      66dbf213
    • Glenn Morris's avatar
      Build simplifications for oldxmenu. · 04384b2d
      Glenn Morris authored
      * configure.in (OLDXMENU): Set to "nothing" if !HAVE_X11 || USE_GTK.
      (OLDXMENU_TARGET): Set to empty if USE_GTK.
      
      * src/Makefile.in (../src/$(OLDXMENU), $(OLDXMENU)): Always define rules.
      
      * msdos/sed1x.inp (OLDXMENU): Replace any initial value.
      * msdos/sed1v2.inp (OLDXMENU): Edit to "nothing".
      04384b2d
    • Glenn Morris's avatar
      Handle CANNOT_DUMP (partially) with configure. · e8752c66
      Glenn Morris authored
      * configure.in (cannot_dump): New output variable.
      
      * src/Makefile.in (CANNOT_DUMP): New, set by configure.
      (emacs${EXEEXT}, bootstrap-emacs${EXEEXT}): Use $CANNOT_DUMP.
      
      * msdos/sed1v2.inp (CANNOT_DUMP): Edit to no.
      e8752c66
  2. 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
  3. 19 May, 2010 1 commit
    • 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
  4. 18 May, 2010 3 commits
    • Glenn Morris's avatar
      Since Cygwin does not set SYSTEM_MALLOC, $(VMLIMIT_OBJ) == vm-limit.o. · 6665f4c5
      Glenn Morris authored
      * configure.in (POST_ALLOC_OBJ) [cygwin]: Omit vm-limit.o.
      (POST_ALLOC_OBJ) [!cygwin]: Set to empty.
      
      * src/Makefile.in (otherobj): Include $(VMLIMIT_OBJ) separately from
      $(POST_ALLOC_OBJ).
      6665f4c5
    • 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
  5. 17 May, 2010 3 commits
  6. 16 May, 2010 8 commits
  7. 15 May, 2010 10 commits
    • Glenn Morris's avatar
      Always define LIBXMENU in src/Makefile.in. · 4235ca47
      Glenn Morris authored
      * configure.in (LIBXMENU): Set to empty if !HAVE_X_WINDOWS.
      
      * src/Makefile.in (LIBXMENU): Always define.
      
      * msdos/sed1v2.inp (LIBXMENU): Edit to empty.
      * msdos/sed1x.inp (LIBXMENU): Expect empty initial value.
      4235ca47
    • Glenn Morris's avatar
      c0b0aed5
    • Glenn Morris's avatar
      Always define OLDXMENU in src/Makefile.in. · 3545021d
      Glenn Morris authored
      * src/Makefile.in (OLDXMENU): Always define.
      
      * msdos/sed1v2.inp (OLDXMENU): Edit to empty.
      * msdos/sed1x.inp (OLDXMENU): Expect empty initial value.
      3545021d
    • Glenn Morris's avatar
      Always define LIBX_OTHER in src/Makefile.in. · 02d4ac0e
      Glenn Morris authored
      * src/Makefile.in (LIBX_OTHER): Always define.
      
      * msdos/sed1v2.inp (LIBX_OTHER): Edit to empty.
      * msdos/sed1x.inp (LIBX_OTHER): Expect empty initial value.
      02d4ac0e
    • Glenn Morris's avatar
      Always define FONT_OBJ; to empty in the non-X case. · 6e546d18
      Glenn Morris authored
      * configure.in (FONT_OBJ): Set to empty if !HAVE_X_WINDOWS.
      
      * src/Makefile.in (FONT_DRIVERS): Remove, replace with $FONT_OBJ.
      (obj, SOME_MACHINE_OBJECTS): Use $FONT_OBJ.
      
      * msdos/sed1v2.inp (FONT_OBJ): Edit to empty for non-X case.
      * msdos/sed1x.inp (FONT_OBJ): Edit to xfont.o for X case.
      6e546d18
    • Eli Zaretskii's avatar
      Fix "config msdos" step. · dbd3f723
      Eli Zaretskii authored
       src/Makefile.in: Fix MSDOS-related comments.
       msdos/sed3v2.inp (INSTALLABLES): Edit out extra ${EXEEXT} after "emacsclient".
       (emacsserver, timer, wakeup): Remove edit-out commands.
       msdos/sed1v2.inp (MSDOS_OBJ): Add w16select.o.
       (TERMCAP_OBJ): Add termcap.o.
      dbd3f723
    • Glenn Morris's avatar
      Choose dependency of oldxmenu using configure. · 1a82cca9
      Glenn Morris authored
      * configure.in (OLDXMENU_TARGET): New output variable.
      
      * src/Makefile.in (OLDXMENU_TARGET): New, set by configure.
      (really-lwlib, really-oldXMenu): Always define.
      ($OLDXMENU): Depend on $OLDXMENU_TARGET.
      
      * msdos/sed1v2.inp (OLDXMENU_TARGET): Edit to empty.
      * msdos/sed1x.inp (OLDXMENU_TARGET): Edit to really-oldxmenu.
      1a82cca9
    • Glenn Morris's avatar
      If HAVE_X11, also HAVE_X_WINDOWS and HAVE_MENUS. · 3df7b338
      Glenn Morris authored
      * src/Makefile.in: Simplify cpp conditional.
      
      * admin/CPP-DEFINES: Comment.
      3df7b338
    • Glenn Morris's avatar
      Minor NS build fixes. · 2b5f541b
      Glenn Morris authored
      * Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.
      
      * src/Makefile.in (${ns_appdir}): Simplify using umask.
      2b5f541b
    • Glenn Morris's avatar
      Remove references to CVS directories etc in Makefiles. · 02be533b
      Glenn Morris authored
      * Makefile.in (install-arch-indep): Remove references to RCS, CVS,
      and other files that no longer exist.
      
      * leim/Makefile.in (install): Remove references to CVS-related files.
      
      * lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
      Remove references to CVS, RCS and Old directories.
      
      * src/Makefile.in (${ns_appdir}): Remove references to CVS-related files.
      02be533b
  8. 14 May, 2010 7 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
      Move some undefs from src/Makefile.in to configure. · fbc00890
      Glenn Morris authored
      * configure.in (cpp_undefs): Add mktime, register, X11.
      
      * src/Makefile.in (mktime, X11, register): Move undefs to configure.
      
      * admin/CPP-DEFINES: Remove X11.
      fbc00890
    • 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
      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
    • Glenn Morris's avatar
      845612ac
    • Glenn Morris's avatar
      * src/Makefile.in (SHELL): Move outside cpp section. · e20f1f07
      Glenn Morris authored
      Some comment formatting.
      e20f1f07
  9. 13 May, 2010 2 commits