From: "Alexey I. Froloff" <[email protected]>

---
 wmpager/Makefile            |  77 ----------------------
 wmpager/configure.ac        |  31 +++++++++
 wmpager/man/Makefile.am     |   3 +
 wmpager/man/man1/wmpager.1x | 156 --------------------------------------------
 wmpager/man/wmpager.1x      | 156 ++++++++++++++++++++++++++++++++++++++++++++
 wmpager/src/Makefile        |  32 ---------
 wmpager/src/Makefile.am     |   4 ++
 wmpager/themes/Makefile.am  |   3 +
 8 files changed, 197 insertions(+), 265 deletions(-)
 delete mode 100644 wmpager/Makefile
 create mode 100644 wmpager/configure.ac
 create mode 100644 wmpager/man/Makefile.am
 delete mode 100644 wmpager/man/man1/wmpager.1x
 create mode 100644 wmpager/man/wmpager.1x
 delete mode 100644 wmpager/src/Makefile
 create mode 100644 wmpager/src/Makefile.am
 create mode 100644 wmpager/themes/Makefile.am

diff --git a/wmpager/Makefile b/wmpager/Makefile
deleted file mode 100644
index c0089b5..0000000
--- a/wmpager/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: Makefile,v 1.3 2002/08/16 17:22:26 essmann Exp $
-#
-# Copyright (c) 2001 Bruno Essmann <[email protected]>
-# All rights reserved.
-
-.SILENT:
-
-INSTALLDIR = /usr/local
-
-all: wmpager
-
-wmpager:
-       @echo "*** `pwd`: $@" ; \
-       cd src ; \
-       $(MAKE) $@
-
-clean:
-       @echo "*** `pwd`: $@" ; \
-       cd src ; \
-       $(MAKE) $@
-
-install:
-       echo "*** `pwd`: $@" ; \
-       if [ ! -f src/wmpager ] ; then \
-               $(MAKE) wmpager ; \
-       fi ; \
-       if [ -z "`id | grep 'uid=.*(root)'`" ] ; then \
-               echo "you must be root to install wmpager!" ; \
-               exit ; \
-       fi ; \
-       for i in bin/wmpager man/man1/wmpager.1x ; do \
-               if [ -f ${INSTALLDIR}/$$i ] ; then \
-                       echo "there's already a $$i in ${INSTALLDIR}" ; \
-                       echo "installation aborted." ; \
-                       exit ; \
-               fi ; \
-       done ; \
-       if [ ! -d ${INSTALLDIR}/bin ] ; then \
-               mkdir -p ${INSTALLDIR}/bin ; \
-       fi ; \
-       echo "copying wmpager to ${INSTALLDIR}/bin" ; \
-       cp src/wmpager ${INSTALLDIR}/bin/wmpager ; \
-       chmod 755 ${INSTALLDIR}/bin/wmpager ; \
-       if [ ! -d ${INSTALLDIR}/man/man1 ] ; then \
-               mkdir -p ${INSTALLDIR}/man/man1 ] ; \
-       fi ; \
-       echo "copying manual page to ${INSTALLDIR}/man/man1" ; \
-       cp man/man1/wmpager.1x ${INSTALLDIR}/man/man1/wmpager.1x ; \
-       chmod 644 ${INSTALLDIR}/man/man1/wmpager.1x ; \
-       echo "copying theme files to ${INSTALLDIR}/share/wmpager" ; \
-       if [ ! -d ${INSTALLDIR}/share/wmpager ] ; then \
-               mkdir -p ${INSTALLDIR}/share/wmpager ; \
-       fi ; \
-       cp src/buttons.xpm ${INSTALLDIR}/share/wmpager/blue.xpm ; \
-       cp themes/*.xpm ${INSTALLDIR}/share/wmpager ; \
-       chmod 644 ${INSTALLDIR}/share/wmpager/* ; \
-       echo "installation complete, make sure your have ${INSTALLDIR}/bin" ; \
-       echo "in your PATH and ${INSTALLDIR}/man in your MANPATH."
-
-uninstall:
-       echo "*** `pwd`: $@" ; \
-       if [ -z "`id | grep 'uid=.*(root)'`" ] ; then \
-               echo "you must be root to uninstall wmpager!" ; \
-               exit ; \
-       fi ; \
-       for i in bin/wmpager man/man1/wmpager.1x ; do \
-               if [ -f ${INSTALLDIR}/$$i ] ; then \
-                       echo "removing $$i from ${INSTALLDIR}" ; \
-                       rm -f ${INSTALLDIR}/$$i ; \
-               fi ; \
-       done ; \
-       if [ -d ${INSTALLDIR}/share/wmpager ] ; then \
-               echo "removing directory $$i from ${INSTALLDIR}" ; \
-               rm -rf ${INSTALLDIR}/share/wmpager ; \
-       fi ; \
-       echo "uninstallation complete."
-
diff --git a/wmpager/configure.ac b/wmpager/configure.ac
new file mode 100644
index 0000000..e96d64b
--- /dev/null
+++ b/wmpager/configure.ac
@@ -0,0 +1,31 @@
+AC_PREREQ([2.60])
+AC_INIT([wmpager], [1.2], [[email protected]])
+AC_CONFIG_SRCDIR([src/wmpager.c])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_SILENT_RULES
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG
+
+# Checks for libraries.
+PKG_CHECK_MODULES([X], [x11 xext xpm])
+AC_SUBST([X_CFLAGS])
+AC_SUBST([X_LIBS])
+
+# Checks for header files.
+AC_CHECK_HEADERS([stdlib.h string.h sys/time.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([gettimeofday select strdup])
+
+AC_CONFIG_FILES([Makefile
+                                man/Makefile
+                 src/Makefile
+                                themes/Makefile])
+AC_OUTPUT
diff --git a/wmpager/man/Makefile.am b/wmpager/man/Makefile.am
new file mode 100644
index 0000000..5e546e8
--- /dev/null
+++ b/wmpager/man/Makefile.am
@@ -0,0 +1,3 @@
+man1_MANS = wmpager.1x
+
+EXTRA_DIST = $(man1_MANS)
diff --git a/wmpager/man/man1/wmpager.1x b/wmpager/man/man1/wmpager.1x
deleted file mode 100644
index ce27b17..0000000
--- a/wmpager/man/man1/wmpager.1x
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" $Id: wmpager.1x,v 1.2 2002/08/16 17:20:37 essmann Exp $
-.\"
-.\" Copyright (c) 2001-2002 Bruno Essmann <[email protected]>
-.\" All rights reserved.
-.\"
-.TH wmpager 1x "2002 Aug 16" "wmpager-1.2"
-.SH NAME
-wmpager - Window Maker workspace pager docklet
-.SH SYNOPSIS
-.B wmpager
-[options]
-.SH DESCRIPTION
-.B wmpager
-is a Window Maker pager docklet that offers:
-.PD 0
-.IP \(bu 2
-workspace switching for up to nine workspaces
-.IP \(bu 2
-automatic configuration according to the number of available workspaces
-.IP \(bu 2
-automagic adjustment to the currently active workspace
-.IP \(bu 2
-configurable look and feel
-.IP \(bu 2
-workspace tooltips
-.PD
-.SH OPTIONS
-.PD 0
-.TP
-.B \-h \-\-help
-Display usage and version information.
-.TP
-.B \-v \-\-verbose
-Enable verbose message output.
-.TP
-.B \-d \-\-display \fI<name>\fP
-The display to use (defaults to the 'DISPLAY' environment variable).
-.TP
-.B \-s \-\-size \fI<w>x<h>\fP
-The number of buttons to display. The default depends on the number of 
-workspaces you have, i.e. 2x2 for 4 workspaces, 2x3 for 6, maximum is 3x3.
-.TP
-.B \-w \-\-workspaces \fI<count>\fP
-The number of workspace buttons to display. The default is the number of 
-workspaces you have up to a maximum is 9.
-.TP
-.B \-t \-\-theme \fI<theme.xpm>\fP
-The button theme to use. \fI<theme.xpm>\fP is either an absolute pathname
-pointing to an 'xpm' theme file or a filename relative to the installation
-directory (see option \-\-installdir). The extension '.xpm' in the file or
-pathname is optional.
-.RS
-.PP
-For more information on theme files see the entry \fIBUTTON THEMES\fP below.
-.RE
-.TP
-.B \-i \-\-installdir \fI<dir>\fP
-Specifies the location of the installation directory. wmpager looks for 'xpm'
-theme files at this location. The default are '/usr/local/share/wmpager/' and
-the user specific '~/.wmpager' directory.
-.TP
-.B \-\-disable\-tooltips
-Disables display of any tooltip windows. By default tooltips are enabled.
-.TP
-.B \-\-tooltip\-font \fI<font>\fP
-Specifies the font to as tooltip font. The default is helvetica, bold, roman, 
-12 point:
-.RS
-.PP
-\-*\-helvetica\-bold\-r\-normal\-*\-12\-*\-*\-*\-*\-*\-*\-*
-.RE
-.TP
-.B \-\-tooltip\-delay \fI<millis>\fP
-Sets the delay before the tooltip window is popped up (default is 750 
milliseconds).
-.TP
-.B \-\-tooltip\-reshow \fI<millis>\fP
-Set the tooltip reshow delay (triggered when moving from button to button).
-The default is 1500 milliseconds.
-.TP
-.B \-\-tooltip\-outside
-Specifies that tooltips should be displayed outside of the docklet window.
-By default they are displayed next to the workspace button.
-.PD
-.SH BUTTON THEMES
-.PD
-Depending on your WindowMaker theme you might want to use another
-theme for wmpager as well. Use option '\-t' or '\-\-theme' to specify
-the location of an XPM file (the extension '.xpm' is optional, it has
-to be an XPM file though). If you use option '\-i', '\-\-installdir' or
-have set the environment variable WMPAGER to the installation location
-of the wmpager themes, then you may also skip the path to the theme.
-
-Predefined themes: Well, I'm not much of an artist therefore I've only
-included some themes to give you an idea of how a real nice theme 
-might be done. Naturally, I use the built\-in theme and theme support
-is only there because I have been asked to include it...
-
-If you create a theme yourself please send it to me and I'll include it
-in the next build.
-
-The list of predefined themes in this release includes:
-.PD 0
-.IP \(bu 2
-blue (the built\-in theme)
-.IP \(bu 2
-fire
-.IP \(bu 2
-gray
-.IP \(bu 2
-steel
-.RE 2
-
-Creating your own themes: If you want to create your own theme simply
-take one of the included XPM theme files and modify it to your needs. 
-If you really want to know, the format of the file is described below.
-
-XPM file format: The XPM file has to be at least 102 by 71 pixels in 
-size. The area 0,0 to 50,50 describes the background for the selected 
-workspace, the area 51,0 to 101,50 for unselected work spaces. The 
-area has to include a one\-pixel border that is used for all workspace 
-buttons. From 0,51 to 89,60 are the digits used for the selected 
-workspace (each 10x10 pixels, 1\-9 from left to right) and from 0,61 to 
-89,70 are the digits for unselected workspaces. The digits may have
-a transparent background.
-.PD
-.SH REQUIREMENTS
-In order for wmpager to work properly you need to have your Window
-Maker compiled with Gnome support. (I don't know if this is the case
-for the precompiled Window Makers usually found in Linux distributions
-since I usually build my Window Maker myself.)
-
-wmpager uses the Gnome support messages sent out by Window Maker to
-display the currently active workspace. Without Gnome support the
-pager will not automatically adjust the currently active desktop.
-.PD
-.SH BUGS
-.PD 0
-To file a bugreport please use the bug tracking system at:
-.TP
-\fIhttp://sourceforge.net/projects/wmpager/\fP
-.PD
-.SH AUTHOR
-.PD 0
-Bruno Essmann <[email protected]>
-.LP
-\fIhttp://wmpager.sourceforge.net/\fP
-.PD
-.SH ACKNOWLEDGEMENTS
-.PD 0
-Thanks to all at Ergon Informatik AG who are using wmpager and helped 
-improve it!
-.LP
-\fIhttp://www.ergon.ch/\fP
-.PD
-.SH "SEE ALSO"
-\fBwmaker\fP(1x)
diff --git a/wmpager/man/wmpager.1x b/wmpager/man/wmpager.1x
new file mode 100644
index 0000000..ce27b17
--- /dev/null
+++ b/wmpager/man/wmpager.1x
@@ -0,0 +1,156 @@
+.\" $Id: wmpager.1x,v 1.2 2002/08/16 17:20:37 essmann Exp $
+.\"
+.\" Copyright (c) 2001-2002 Bruno Essmann <[email protected]>
+.\" All rights reserved.
+.\"
+.TH wmpager 1x "2002 Aug 16" "wmpager-1.2"
+.SH NAME
+wmpager - Window Maker workspace pager docklet
+.SH SYNOPSIS
+.B wmpager
+[options]
+.SH DESCRIPTION
+.B wmpager
+is a Window Maker pager docklet that offers:
+.PD 0
+.IP \(bu 2
+workspace switching for up to nine workspaces
+.IP \(bu 2
+automatic configuration according to the number of available workspaces
+.IP \(bu 2
+automagic adjustment to the currently active workspace
+.IP \(bu 2
+configurable look and feel
+.IP \(bu 2
+workspace tooltips
+.PD
+.SH OPTIONS
+.PD 0
+.TP
+.B \-h \-\-help
+Display usage and version information.
+.TP
+.B \-v \-\-verbose
+Enable verbose message output.
+.TP
+.B \-d \-\-display \fI<name>\fP
+The display to use (defaults to the 'DISPLAY' environment variable).
+.TP
+.B \-s \-\-size \fI<w>x<h>\fP
+The number of buttons to display. The default depends on the number of 
+workspaces you have, i.e. 2x2 for 4 workspaces, 2x3 for 6, maximum is 3x3.
+.TP
+.B \-w \-\-workspaces \fI<count>\fP
+The number of workspace buttons to display. The default is the number of 
+workspaces you have up to a maximum is 9.
+.TP
+.B \-t \-\-theme \fI<theme.xpm>\fP
+The button theme to use. \fI<theme.xpm>\fP is either an absolute pathname
+pointing to an 'xpm' theme file or a filename relative to the installation
+directory (see option \-\-installdir). The extension '.xpm' in the file or
+pathname is optional.
+.RS
+.PP
+For more information on theme files see the entry \fIBUTTON THEMES\fP below.
+.RE
+.TP
+.B \-i \-\-installdir \fI<dir>\fP
+Specifies the location of the installation directory. wmpager looks for 'xpm'
+theme files at this location. The default are '/usr/local/share/wmpager/' and
+the user specific '~/.wmpager' directory.
+.TP
+.B \-\-disable\-tooltips
+Disables display of any tooltip windows. By default tooltips are enabled.
+.TP
+.B \-\-tooltip\-font \fI<font>\fP
+Specifies the font to as tooltip font. The default is helvetica, bold, roman, 
+12 point:
+.RS
+.PP
+\-*\-helvetica\-bold\-r\-normal\-*\-12\-*\-*\-*\-*\-*\-*\-*
+.RE
+.TP
+.B \-\-tooltip\-delay \fI<millis>\fP
+Sets the delay before the tooltip window is popped up (default is 750 
milliseconds).
+.TP
+.B \-\-tooltip\-reshow \fI<millis>\fP
+Set the tooltip reshow delay (triggered when moving from button to button).
+The default is 1500 milliseconds.
+.TP
+.B \-\-tooltip\-outside
+Specifies that tooltips should be displayed outside of the docklet window.
+By default they are displayed next to the workspace button.
+.PD
+.SH BUTTON THEMES
+.PD
+Depending on your WindowMaker theme you might want to use another
+theme for wmpager as well. Use option '\-t' or '\-\-theme' to specify
+the location of an XPM file (the extension '.xpm' is optional, it has
+to be an XPM file though). If you use option '\-i', '\-\-installdir' or
+have set the environment variable WMPAGER to the installation location
+of the wmpager themes, then you may also skip the path to the theme.
+
+Predefined themes: Well, I'm not much of an artist therefore I've only
+included some themes to give you an idea of how a real nice theme 
+might be done. Naturally, I use the built\-in theme and theme support
+is only there because I have been asked to include it...
+
+If you create a theme yourself please send it to me and I'll include it
+in the next build.
+
+The list of predefined themes in this release includes:
+.PD 0
+.IP \(bu 2
+blue (the built\-in theme)
+.IP \(bu 2
+fire
+.IP \(bu 2
+gray
+.IP \(bu 2
+steel
+.RE 2
+
+Creating your own themes: If you want to create your own theme simply
+take one of the included XPM theme files and modify it to your needs. 
+If you really want to know, the format of the file is described below.
+
+XPM file format: The XPM file has to be at least 102 by 71 pixels in 
+size. The area 0,0 to 50,50 describes the background for the selected 
+workspace, the area 51,0 to 101,50 for unselected work spaces. The 
+area has to include a one\-pixel border that is used for all workspace 
+buttons. From 0,51 to 89,60 are the digits used for the selected 
+workspace (each 10x10 pixels, 1\-9 from left to right) and from 0,61 to 
+89,70 are the digits for unselected workspaces. The digits may have
+a transparent background.
+.PD
+.SH REQUIREMENTS
+In order for wmpager to work properly you need to have your Window
+Maker compiled with Gnome support. (I don't know if this is the case
+for the precompiled Window Makers usually found in Linux distributions
+since I usually build my Window Maker myself.)
+
+wmpager uses the Gnome support messages sent out by Window Maker to
+display the currently active workspace. Without Gnome support the
+pager will not automatically adjust the currently active desktop.
+.PD
+.SH BUGS
+.PD 0
+To file a bugreport please use the bug tracking system at:
+.TP
+\fIhttp://sourceforge.net/projects/wmpager/\fP
+.PD
+.SH AUTHOR
+.PD 0
+Bruno Essmann <[email protected]>
+.LP
+\fIhttp://wmpager.sourceforge.net/\fP
+.PD
+.SH ACKNOWLEDGEMENTS
+.PD 0
+Thanks to all at Ergon Informatik AG who are using wmpager and helped 
+improve it!
+.LP
+\fIhttp://www.ergon.ch/\fP
+.PD
+.SH "SEE ALSO"
+\fBwmaker\fP(1x)
diff --git a/wmpager/src/Makefile b/wmpager/src/Makefile
deleted file mode 100644
index 4ec190d..0000000
--- a/wmpager/src/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: Makefile,v 1.2 2002/08/16 17:22:26 essmann Exp $
-#
-# Copyright (c) 2001 Bruno Essmann <[email protected]>
-# All rights reserved.
-
-.SILENT:
-
-XPMINC = /usr/X11R6/include
-XPMLIB = /usr/X11R6/lib
-
-INCLUDES = -I/usr/X11R6/include -I/usr/local/include -I/usr/include/X11R6 
-I$(XPMINC)
-LIBINC = -L/usr/X11R6/lib -L/usr/include/lib -L$(XPMLIB)
-LIBS = -lm -lX11 -lXpm -lXext
-
-TARGET = wmpager
-OBJECTS = wmpager.o
-SOURCE = wmpager.c
-
-all: ${TARGET}
-
-${OBJECTS}: ${SOURCE}
-       @echo "*** `pwd`: $@" ; \
-       gcc -g -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-
-${TARGET}: ${OBJECTS}
-       @echo "*** `pwd`: $@" ; \
-       gcc -g -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-
-clean:
-       @echo "*** `pwd`: $@" ; \
-       for i in ${OBJECTS}; do if [ -f $$i ] ; then rm $$i; fi; done ; \
-       if [ -f ${TARGET} ] ; then rm ${TARGET}; fi
diff --git a/wmpager/src/Makefile.am b/wmpager/src/Makefile.am
new file mode 100644
index 0000000..4af9d4d
--- /dev/null
+++ b/wmpager/src/Makefile.am
@@ -0,0 +1,4 @@
+bin_PROGRAMS = wmpager
+wmpager_SOURCES = wmpager.c buttons.xpm screen.xpm
+wmpager_CPPFLAGS = -DWMPAGER_DEFAULT_INSTALL_DIR=\"$(pkgdatadir)/\" @X_CFLAGS@
+wmpager_LDADD = @X_LIBS@
diff --git a/wmpager/themes/Makefile.am b/wmpager/themes/Makefile.am
new file mode 100644
index 0000000..ffeb4a7
--- /dev/null
+++ b/wmpager/themes/Makefile.am
@@ -0,0 +1,3 @@
+pkgdata_DATA = fire.xpm  gray.xpm  steel.xpm 
+
+EXTRA_DIST = $(pkgdata_DATA)
-- 
1.7.11.4


-- 
To unsubscribe, send mail to [email protected].

Reply via email to