From 0bf087928650aaad489edd9aad1d5cef67c2e5e0 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sun, 27 Aug 2017 14:58:44 -0400 Subject: [PATCH] wmressel: Use automake. --- wmressel/Makefile.am | 11 ++ wmressel/Makefile.in | 13 -- wmressel/configure.ac | 7 +- wmressel/install-sh | 251 --------------------------------------- wmressel/src/Makefile.in | 17 --- wmressel/src/wmressel.c | 5 +- 6 files changed, 17 insertions(+), 287 deletions(-) create mode 100644 wmressel/Makefile.am delete mode 100644 wmressel/Makefile.in delete mode 100755 wmressel/install-sh delete mode 100644 wmressel/src/Makefile.in diff --git a/wmressel/Makefile.am b/wmressel/Makefile.am new file mode 100644 index 0000000..484a476 --- /dev/null +++ b/wmressel/Makefile.am @@ -0,0 +1,11 @@ +bin_PROGRAMS = wmressel +wmressel_SOURCES = src/wmressel.c src/wmressel-mask.xbm src/wmressel-master.xpm + +dist_man_MANS = wmressel.1 + +EXTRA_DIST = BUGS HINTS + +AM_CFLAGS = $(Xlib_CFLAGS) $(libXpm_CFLAGS) $(Xext_CFLAGS) $(Xxf86vm_CFLAGS) \ + $(Xinerama_CFLAGS) $(GTK_CFLAGS) +LIBS += $(Xlib_LIBS) $(libXpm_LIBS) $(Xext_LIBS) $(Xxf86vm_LIBS) \ + $(Xinerama_LIBS) $(GTK_LIBS) diff --git a/wmressel/Makefile.in b/wmressel/Makefile.in deleted file mode 100644 index 88b3b53..0000000 --- a/wmressel/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -DESTDIR = @prefix@ - -wmressel: - cd src && make - -clean: - cd src && make $@ - -install:: wmressel - @INSTALL@ -s -m 0755 src/wmressel $(DESTDIR)/bin/ - @INSTALL@ -m 0644 wmressel.1 $(DESTDIR)/man/man1/ - @echo "wmressel installation finished..." - diff --git a/wmressel/configure.ac b/wmressel/configure.ac index 7fd422b..57a955c 100644 --- a/wmressel/configure.ac +++ b/wmressel/configure.ac @@ -1,8 +1,9 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/wmressel.c) +AC_INIT([wmressel], [0.8], [wmaker-dev@lists.windowmaker.org]) +AC_CONFIG_SRCDIR([src/wmressel.c]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) dnl Checks for programs. -AC_PROG_INSTALL AC_PROG_CC dnl Checks for libraries. @@ -18,4 +19,4 @@ PKG_CHECK_MODULES(GTK,gtk+-3.0) dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_PID_T -AC_OUTPUT(Makefile src/Makefile) +AC_OUTPUT([Makefile]) diff --git a/wmressel/install-sh b/wmressel/install-sh deleted file mode 100755 index e9de238..0000000 --- a/wmressel/install-sh +++ /dev/null @@ -1,251 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5 (mit/util/scripts/install.sh). -# -# Copyright 1991 by the Massachusetts Institute of Technology -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation, and that the name of M.I.T. not be used in advertising or -# publicity pertaining to distribution of the software without specific, -# written prior permission. M.I.T. makes no representations about the -# suitability of this software for any purpose. It is provided "as is" -# without express or implied warranty. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - chmodcmd="" - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 diff --git a/wmressel/src/Makefile.in b/wmressel/src/Makefile.in deleted file mode 100644 index ad29705..0000000 --- a/wmressel/src/Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -LIBS = -L/usr/lib @X_LIBS@ @X_PRE_LIBS@ -lX11 @LIBS@ @X_EXTRA_LIBS@ -FLAGS = @CFLAGS@ @GTK_CFLAGS@ @DEFS@ -OBJS = wmressel.o wmgeneral/wmgeneral.o wmgeneral/misc.o wmgeneral/list.o - -.c.o: - cc $(FLAGS) -c $< -o $*.o - -wmressel: $(OBJS) - cc $(FLAGS) -o wmressel $^ $(LIBS) - -all:: wmressel - -clean:: - for i in $(OBJS) ; do \ - rm -f $$i ; \ - done - rm -f wmressel diff --git a/wmressel/src/wmressel.c b/wmressel/src/wmressel.c index 8abe573..b971542 100644 --- a/wmressel/src/wmressel.c +++ b/wmressel/src/wmressel.c @@ -48,7 +48,6 @@ Read the COPYING file for the complete GNU license. #define MY_EMAIL "slix@gcu-squad.org" #define GCU_HOME "http://gcu-squad.org/" -#define WMRESSEL_VERSION "0.8" typedef struct { int screen; @@ -471,7 +470,7 @@ void BlitNum(int num, int x, int y) void usage(void) { - printf ("\n wmressel version %s -- X11 resolution selector for Window Maker\n", WMRESSEL_VERSION ); + printf ("\n wmressel version %s -- X11 resolution selector for Window Maker\n", PACKAGE_VERSION ); printf (" Copyright (C) 2002 Sébastien Liénard <%s>\n", MY_EMAIL); printf (" from GCU (%s)\n",GCU_HOME); printf (" This software comes with NO WARRANTY.\n\n"); @@ -491,5 +490,5 @@ void usage(void) \*******************************************************************************/ void printVersion(void) { - fprintf(stderr, "wmressel v%s\n", WMRESSEL_VERSION); + fprintf(stderr, "wmressel v%s\n", PACKAGE_VERSION); }