From 45c55a3e7617b9295d0751162c2f6d3eb4be8f81 Mon Sep 17 00:00:00 2001 From: kojima Date: Sat, 23 Oct 2004 00:00:58 +0000 Subject: [PATCH] cleanup --- INSTALL | 28 ++--- Install | 273 --------------------------------------------- Makefile.am | 11 +- WindowMaker.lsm.in | 20 ---- 4 files changed, 11 insertions(+), 321 deletions(-) delete mode 100755 Install delete mode 100644 WindowMaker.lsm.in diff --git a/INSTALL b/INSTALL index ec64e2da..a321d855 100644 --- a/INSTALL +++ b/INSTALL @@ -64,26 +64,18 @@ The following software is required to use Window Maker: The following is required to build Window Maker: - Basic obvious stuff - If you will build Window Maker, make sure you have gcc (or some - other ANSI C compiler) and the X header files installed. Specially - for newbie Linux users: you must install all X development packages - and the gcc suite. Otherwise you won't be able to build any X - program, including Window Maker. + gcc (or some other ANSI C compiler) + glibc development files (usually glibc-devel in Linux distributions) + X development files (XFree86-devel or something similar) - autoconf, automake and libtool - These tools are NOT needed, but IF you have one or - more of them installed, make sure you have ALL of the following - with exactly these versions: - autoconf 2.54 - automake 1.4 - libtool 1.4.2 - If you have a different version, disable them by temporarily - renaming them to something else or uninstalling them from your - system. If you don't develop software you don't need them, - so you can safely uninstall. + autoconf 2.54 + automake 1.4 + libtool 1.4.2 -- Xft2 and its dependencies (such as freetype2 and fontconfig) - For the Antialiased text support. +- Xft2 + and its dependencies (such as freetype2 and fontconfig) + You will also need the development files for it (xft2-devel) OPTIONAL: @@ -134,7 +126,7 @@ some Window Maker features. Example: ./configure --enable-modelock --disable-gif will configure Window Maker with modelock supported and disable gif support. - +Normally, you won't need any of them. To get a list of other options, run ./configure --help diff --git a/Install b/Install deleted file mode 100755 index 49c119d2..00000000 --- a/Install +++ /dev/null @@ -1,273 +0,0 @@ -#!/bin/sh -# -# WindowMaker configuration and compilation script. -# -# Copyright (c) 1997, 1998, 1999 Alfredo K. Kojima -# - -export LINGUAS;LINGUAS="" -if test "$NLSDIR" = ""; then -export NLSDIR;NLSDIR="/usr/lib/locale" -fi - - -OPTIONS="" -PREFIX="/usr/local" - -perai() { - echo "Type to continue" - read nada -} - - -perform() { - if ! $* ; then - echo - echo "Window Maker installation failed or aborted by user." - exit 1 - fi -} - -help() { - echo "Usage: $(basename $0) " - echo "Where switches are:" - echo " -s --quiet make silent build" - echo " -h --help show this message" - echo "" - exit $1 -} - - -OPTIONS="" -MAKE_OPTIONS="" -while [ -n "$1" ] -do - case "$1" in - "-s"|"--quiet") OPTIONS="--quiet" - MAKE_OPTIONS="-s";; - "-h"|"--help") help 0;; - *) echo "bad command-line parameter $1" - help 1;; - esac - shift -done - -trap "echo Window Maker installation aborted. ; exit 1" 2 3 - -echo -echo "=========================" -echo "Window Maker Installation" -echo "=========================" -echo -echo "NOTE: If this script fails, read the INSTALL file and" -echo "install by hand." -echo -echo "Please read the README, INSTALL and FAQ files before e-mailing " -echo "questions. We will IGNORE any questions that are already" -echo "answered in the documentation." -echo -perai -echo "Did you read the INSTALL file?" -echo -n " " -read rtfm -if [ "$rtfm" != y ]; then - echo "Please read the INSTALL file before installing" - exit -fi -echo "Are you sure?" -echo -n " " -read rtfm -if [ "$rtfm" != y ]; then - echo "Please read the INSTALL file before installing" - exit -fi -echo "Are you lying?" -echo -n " " -read rtfm -if [ "$rtfm" != n ]; then - echo "What a shame!" - echo "Please read the INSTALL file before installing" - exit -fi -echo "Do you *swear* that you really read the INSTALL file?" -echo -n " " -read rtfm -if [ "$rtfm" != y ]; then - echo "Please read the INSTALL file before installing" - exit -fi -echo "Last chance. You will not get help if you have some problem" -echo "because you didn't read that file. Even if your computer explodes." -echo "Do you *really* read it?" -echo -n " " -read rtfm -if [ "$rtfm" != y ]; then - echo "Please read the INSTALL file before installing" - exit -fi -echo -echo "Ok, you have been warned." -echo -perai - - -if test "$USER" != "root"; then - echo - echo "Warning: you must run this script as root to install" - echo "Window Maker. Hit - to quit this script." - perai - echo -fi - - -echo -echo "Option Selection" -echo "================" - -######################## NLS -echo -echo "Do you want National Language Support?" -echo -n " [n] " -read NLS - -if [ "$NLS" = "y" -o "$NLS" = "Y" ]; then - NLS="Y" - echo "The supported locales are:" - ling=` (cd po; /bin/ls *.po) ` - ALL_LINGUAS="" - for l in $ling; do - lname=`(cd po; grep Language-Team $l|cut -f2- -d:|cut -f1 -d\\\\|cut -f1 -d\<)` - lname=`echo $lname` - lcode=`basename $l .po` - ALL_LINGUAS="$ALL_LINGUAS $lcode" - echo "$lcode $lname" - done - echo "Type in the locales you want (all will install everything) [none]" - read foo - if test "$foo" = "all"; then - LINGUAS="$ALL_LINGUAS" - else - LINGUAS="$foo" - fi - echo "Selected locales are: $LINGUAS" - - MB="" - for i in $LINGUAS; do - ok=0 - for b in $ALL_LINGUAS; do - if test "$b" = "$i"; then - ok=1 - break - fi - done - if test "$ok" = "0"; then - echo - echo "$i is not a supported locale" - perai - continue - fi - - done - echo - echo "Where do you want to put the message files? [$NLSDIR]" - echo -n "? " - read foo - if test "x$foo" != "x"; then - NLSDIR=$foo - fi -fi -##################### Installation path - -done=0 -while [ $done = 0 ]; do - echo - echo "Where do you want to install Window Maker? [$PREFIX]" - echo "Don't change it if you don't know what you're doing." - if test "$USER" != "root"; then - echo "Make sure to specify a path where you have write permission." - fi - echo "(The default will put Window Maker in $PREFIX/bin, $PREFIX/lib etc.)" - echo -n "? " - read foo - if test "x$foo" != "x"; then - if [ "$foo" = "y" -o "$foo" = "n" ]; then - echo - echo "Hmm... I don't think you really want to install Window Maker into \"$foo\"" - echo - else - done=1 - PREFIX=$foo - fi - else - done=1 - fi - echo - echo " $PREFIX/bin must be in the PATH environment variable" - echo "of all users who will use Window Maker" - perai -done - -OPTIONS="$OPTIONS --prefix=$PREFIX" - - -##################### Install stripped binaries? - -INSTALL="install" -echo "Do you want stripped binaries to be installed?" -echo "Installed binaries will be smaller (with debug info removed)." -echo -n " [n] " -read foo -if [ "$foo" = y -o "$foo" = Y ]; then - INSTALL="install-strip" -fi - - -##################### Configure -echo "--------------------------" -echo "Configuring Window Maker..." -echo "--------------------------" -if [ `uname -s` = "SCO_SV" ]; then - echo "CFLAGS=\"$CFLAGS -belf -DANSICPP\" ./configure $OPTIONS" - - CFLAGS="$CFLAGS -belf -DANSICPP" - - perform ./configure $OPTIONS -else - echo "CFLAGS=\"$CFLAGS $GCCFLAGS\" ./configure $OPTIONS" - - CFLAGS="$CFLAGS $GCCFLAGS" - - perform ./configure $OPTIONS -fi - - -#################### Compile -echo "-------------------------" -echo "Compiling Window Maker..." -echo "-------------------------" -(cd src; perform make $MAKE_OPTIONS clean) -perform make $MAKE_OPTIONS - -echo "--------------------------" -echo "Installing Window Maker..." -echo "--------------------------" - -perform make $MAKE_OPTIONS $INSTALL - -if [ `uname -s` = "Linux" ]; then - echo - echo " Make sure $PREFIX/lib is in the /etc/ld.so.conf file" - /sbin/ldconfig -fi - -echo -echo "Installation Finished!" -echo -echo "Now, each user that wishes to use WindowMaker must run the wmaker.inst" -echo "script that was just installed." - - -if test "$NLS" = "Y"; then - echo "Don't forget to set the LANG environment variable to your locale" -fi - diff --git a/Makefile.am b/Makefile.am index c7dd92b5..79aaed87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,15 +5,6 @@ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc\ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk \ Install INSTALL.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk \ - README.definable-cursor README.pt MIRRORS COPYING.WTFPL mkpatch \ - WindowMaker.lsm.in + README.definable-cursor README.pt MIRRORS COPYING.WTFPL mkpatch # libwmfun-0.0.3.tar.gz -WindowMaker.lsm: WindowMaker.lsm.in - size=`wc -c $(distdir).tar.gz|cut -d\ -f1`;\ - size=`echo scale=2\;$$size/1048576|bc`;\ - sed -e "s/VERSION/"$(VERSION)"/" \ - -e "s/DATE/`date +%d%b%Y|tr a-z A-Z`/"\ - -e "s/SIZE/$$size M/"\ - WindowMaker.lsm.in > WindowMaker-$(VERSION).lsm - diff --git a/WindowMaker.lsm.in b/WindowMaker.lsm.in deleted file mode 100644 index 58f0e76d..00000000 --- a/WindowMaker.lsm.in +++ /dev/null @@ -1,20 +0,0 @@ -Begin3 -Title: Window Maker window manager -Version: VERSION -Entered-date: DATE -Description: N*EXTSTEP alike, good looking, fast and easy to use/configure - window manager for X11. Features support for GNUstep, ICCCM, - Motif(tm) and NETWM hints. Multiple workspaces, easy to use - application dock, very flexible menus, graphical configuration, - 13 types of decoration textures, national language support, - themes etc -Keywords: window-manager X11 GNUstep NEXTSTEP NETWM Motif XFT -Author: kojima@windowmaker.org (Alfredo K. Kojima) -Maintained-by: kojima@windowmaker.org (Alfredo K. Kojima) - dan@windowmaker.org (Dan Pascu) -Primary-site: ftp.windowmaker.org/pub/beta/srcs - SIZE WindowMaker-VERSION.tar.gz -Home-page: http://www.windowmaker.org -Platforms: X11 -Copying-policy: GPL 2.0 -End