1. 16 May, 2010 5 commits
  2. 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
  3. 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
  4. 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
  5. 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
  6. 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
  7. 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
  8. 08 May, 2010 2 commits
    • Glenn Morris's avatar
      Remove unused Makefile definition THIS_IS_MAKEFILE. · 7b42b29f
      Glenn Morris authored
      * src/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
      * lib-sc/Makefile.in (THIS_IS_MAKEFILE): Remove, unused.
      * admin/CPP-DEFINES (THIS_IS_MAKEFILE): Remove.
      7b42b29f
    • 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
  9. 07 May, 2010 4 commits
    • 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
    • Eli Zaretskii's avatar
      Fix the "config msdos" step of MS-DOS build (due to removal of some cpp stuff from configury). · f724825e
      Eli Zaretskii authored
       config.bat: Allow for 2 leading `#'s in comments in src/Makefile.in.
       src/Makefile.in: Don't use Make-style comments past the
       "start of cpp stuff" line.
      f724825e
    • Glenn Morris's avatar
      Move LD_SWITCH_SYSTEM from cpp to configure. · 2f86b22b
      Glenn Morris authored
      * configure.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
      Merges logic from src/s/* and src/Makefile.in.
      (LD_SWITCH_SYSTEM_TEMACS): New output variable.
      
      * src/Makefile.in (LD_SWITCH_SYSTEM): Set with configure, not cpp.
      (LD_SWITCH_SYSTEM_EXTRA): New variable, set by configure.
      (TEMACS_LDFLAGS): Use $LD_SWITCH_SYSTEM and $LD_SWITCH_SYSTEM_EXTRA,
      move out of cpp section.
      * src/s/freebsd.h (LD_SWITCH_SYSTEM):
      * src/s/gnu-linux.h (LD_SWITCH_SYSTEM):
      * src/s/netbsd.h (LD_SWITCH_SYSTEM):
      
      * admin/CPP-DEFINES: Remove LD_SWITCH_SYSTEM.
      2f86b22b
    • Dan Nicolaescu's avatar
      Define LIB_STANDARD and START_FILES using autoconf. · 49ebbd65
      Dan Nicolaescu authored
      * s/usg5-4.h (LIB_STANDARD):
      * s/netbsd.h (START_FILES):
      * s/irix6-5.h (LIB_STANDARD):
      * s/hpux10-20.h (LIB_STANDARD, START_FILES):
      * s/gnu-linux.h (START_FILES, LIB_STANDARD):
      * s/freebsd.h (START_FILES):
      * s/darwin.h (START_FILES):
      * s/cygwin.h (START_FILES):
      * s/aix4-2.h (LIB_STANDARD):
      * m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in.
      * Makefile.in (STARTFILES): Rename to START_FILES, define using
      autoconf, not cpp.
      
      Define START_FILES and LIB_STANDARD using autoconf.
      * configure.in (START_FILES, LIB_STANDARD): New definitions, moved
      here from src/s/*.h.
      (HAVE_CRTIN): Remove, inline logic in the netbsd
      START_FILES/LIB_STANDARD computation.
      49ebbd65
  10. 06 May, 2010 2 commits
    • Dan Nicolaescu's avatar
      * Makefile.in (STARTFILES): Conditionally define to make the usage clear. · d43c06d6
      Dan Nicolaescu authored
      * s/gnu.h (START_FILES): Remove empty definition.
      d43c06d6
    • 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