1. 18 May, 2010 1 commit
    • 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
  2. 17 May, 2010 3 commits
  3. 16 May, 2010 8 commits
  4. 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
  5. 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
  6. 13 May, 2010 6 commits
    • Glenn Morris's avatar
      Unify some conditionals in src/Makefile.in. · 3369c79f
      Glenn Morris authored
      * src/Makefile.in (FONT_DRIVERS): Place with other HAVE_X_WINDOWS stuff.
      (TOOLTIP_SUPPORT): Place with other HAVE_WINDOW_SYSTEM stuff.
      3369c79f
    • Glenn Morris's avatar
      Minor simplification for src/Makefile.in. · d5e982a6
      Glenn Morris authored
      * src/Makefile.in (FONT_DRIVERS): If HAVE_X_WINDOWS is defined,
      HAVE_WINDOW_SYSTEM must be too.
      d5e982a6
    • Glenn Morris's avatar
      Remove WINNT_SUPPORT from src/Makefile.in, · 6192e163
      Glenn Morris authored
      * src/Makefile.in (WINNT_SUPPORT): Remove, nt build does not use this file
      but rather makefile.w32-in.
      (lisp): Remove WINNT_SUPPORT.
      6192e163
    • Glenn Morris's avatar
      Let configure set OLDXMENU, LIBXMENU if !HAVE_MENUS. · 472c5d6b
      Glenn Morris authored
      * configure.in (OLDXMENU, LIBXMENU): Set to empty if !HAVE_MENUS.
      
      * src/Makefile.in (OLDXMENU, LIBXMENU) [!HAVE_MENUS]:
      Let configure set these variables (to empty) in this case as well.
      472c5d6b
    • Glenn Morris's avatar
      Remove some unused #define's, previously replaced by variables. · 0116466b
      Glenn Morris authored
      * configure.in (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Do not define.
      
      * src/Makefile.in (LD_SWITCH_X_SITE): Define as a variable, not via cpp.
      (LIBX_BASE): Use $LD_SWITCH_X_SITE.
      
      * nt/config.nt (LD_SWITCH_X_SITE, C_SWITCH_X_SITE): Remove undefs.
      
      * msdos/sed1v2.inp: Comment.
      0116466b
    • 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
  7. 12 May, 2010 2 commits
    • Glenn Morris's avatar
      Simplify linker-related logic in src/Makefile.in. · b5457f14
      Glenn Morris authored
      * src/Makefile.in (YMF_PASS_LDFLAGS, LD, LINKER): Simplify the logic.
      (LINKER_WAS_SPECIFIED): Remove.
      b5457f14
    • 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
  8. 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
  9. 10 May, 2010 1 commit
    • 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
  10. 08 May, 2010 1 commit