wmCalClock/INSTALL | 28 +++++++++----------------
wmCalClock/Makefile.am | 3 +++
wmCalClock/Src/Makefile | 36 ---------------------------------
wmCalClock/Src/Makefile.am | 18 +++++++++++++++++
wmCalClock/Src/Makefile.sgi | 36 ---------------------------------
wmCalClock/Src/Makefile.solaris | 36 ---------------------------------
wmCalClock/Src/wmCalClock.c | 5 ++++-
wmCalClock/Src/xutils.c | 3 +++
wmCalClock/autogen | 6 ++++++
wmCalClock/
configure.ac | 21 +++++++++++++++++++
10 files changed, 65 insertions(+), 127 deletions(-)
create mode 100644 wmCalClock/Makefile.am
delete mode 100644 wmCalClock/Src/Makefile
create mode 100644 wmCalClock/Src/Makefile.am
delete mode 100644 wmCalClock/Src/Makefile.sgi
delete mode 100644 wmCalClock/Src/Makefile.solaris
create mode 100755 wmCalClock/autogen
create mode 100644 wmCalClock/
configure.ac
diff --git a/wmCalClock/INSTALL b/wmCalClock/INSTALL
index c8b03e4ab4a3..50e402dbfa62 100644
--- a/wmCalClock/INSTALL
+++ b/wmCalClock/INSTALL
@@ -1,24 +1,16 @@
Installation instructions for wmCalClock.
Requirements
---------------------------------------------------------------
-wmCalClock requires the Xpm library (which should be available on
-most machines with XFree86 installed).
+--------------------------------------------------------------------------------
+wmCalClock requires the Xpm and Xext libraries (which should be available on
+most machines with X11 installed).
Installation
---------------------------------------------------------------
+--------------------------------------------------------------------------------
1) gunzip wmCalClock-x.xx.tar.gz
-1) tar -xvf wmCalClock-x.xx.tar
-2) cd wmCalClock-x.xx/Src/
-3) make
-4) make install (must be root)
-5) wmCalClock & (or 'wmCalClock -h' for help, or 'man wmCalClock' for the man page)
-
-
-Notes:
-
-- On FreeBSD, you may need to use gmake.
-- On Solaris 2.6, -lsocket is required (use the Solaris-specfic
- LIB line in the Makefile instead of the default one for Linux).
-- On SGI/IRIX, use gmake (?) or the Makefile.sgi
-
+2) tar -xvf wmCalClock-x.xx.tar
+3) cd wmCalClock-x.xx
+4) ./configure
+5) make
+6) make install (must be root)
+7) wmCalClock & (or 'wmCalClock -h' for help, or 'man wmCalClock' for the man page)
diff --git a/wmCalClock/Makefile.am b/wmCalClock/Makefile.am
new file mode 100644
index 000000000000..e917a94c1635
--- /dev/null
+++ b/wmCalClock/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = BUGS CHANGES HINTS INSTALL
+
+SUBDIRS = Src
diff --git a/wmCalClock/Src/Makefile b/wmCalClock/Src/Makefile
deleted file mode 100644
index d0e6b22baf49..000000000000
--- a/wmCalClock/Src/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux
-LIBS = -lXpm -lX11 -lXext
-
-# for Solaris
-# LIBS = -lXpm -lX11 -lXext -lsocket -lnsl
-
-OBJS = wmCalClock.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
-
-all: wmCalClock.o wmCalClock
-
-wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
-wmCalClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmCalClock
-
-install:: wmCalClock
- install -c -s -m 0755 wmCalClock $(DESTDIR)/bin
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
-
diff --git a/wmCalClock/Src/Makefile.am b/wmCalClock/Src/Makefile.am
new file mode 100644
index 000000000000..d5b6d032aca1
--- /dev/null
+++ b/wmCalClock/Src/Makefile.am
@@ -0,0 +1,18 @@
+AM_CFLAGS = $(x11_CFLAGS) \
+ $(xext_CFLAGS) \
+ $(xpm_CFLAGS)
+
+LDADD = $(x11_LIBS) \
+ $(xext_LIBS) \
+ $(xpm_LIBS)
+
+bin_PROGRAMS = wmCalClock
+
+wmCalClock_SOURCES = wmCalClock.c \
+ wmCalClock_mask.xbm \
+ wmCalClock_master.xpm \
+ wmCalClock_master_LowColor.xpm \
+ xutils.c \
+ xutils.h
+
+dist_man_MANS = wmCalClock.1
diff --git a/wmCalClock/Src/Makefile.sgi b/wmCalClock/Src/Makefile.sgi
deleted file mode 100644
index 436dc5ac3d9c..000000000000
--- a/wmCalClock/Src/Makefile.sgi
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux, IRIX
-LIBS = -lXpm -lX11 -lXext
-
-# for Solaris
-# LIBS = -lXpm -lX11 -lXext -lsocket -lnsl
-
-OBJS = wmCalClock.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -c $< -o $*.o $(INCDIR)
-
-
-all: wmCalClock.o wmCalClock
-
-wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
-wmCalClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $(OBJS) $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmCalClock
-
-install:: wmCalClock
- install -s -m 0755 wmCalClock $(DESTDIR)/bin
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
-
diff --git a/wmCalClock/Src/Makefile.solaris b/wmCalClock/Src/Makefile.solaris
deleted file mode 100644
index 4385c29f9e98..000000000000
--- a/wmCalClock/Src/Makefile.solaris
+++ /dev/null
@@ -1,36 +0,0 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux
-#LIBS = -lXpm -lX11 -lXext
-
-# for Solaris
-LIBS = -lXpm -lX11 -lXext -lsocket -lnsl
-
-OBJS = wmCalClock.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
-
-all: wmCalClock.o wmCalClock
-
-wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm
-wmCalClock: $(OBJS)
- $(CC) $(COPTS) $(SYSTEM) -o wmCalClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmCalClock
-
-install:: wmCalClock
- install -s -m 0755 wmCalClock $(DESTDIR)/bin
- install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1
-
diff --git a/wmCalClock/Src/wmCalClock.c b/wmCalClock/Src/wmCalClock.c
index e5dc520c236c..dbe9467a2faf 100644
--- a/wmCalClock/Src/wmCalClock.c
+++ b/wmCalClock/Src/wmCalClock.c
@@ -87,6 +87,9 @@
/*
* Includes
*/
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
@@ -105,7 +108,7 @@
* Delay between refreshes (in microseconds)
*/
#define DELAY 10000L
-#define WMCALCLOCK_VERSION "1.25"
+#define WMCALCLOCK_VERSION PACKAGE_VERSION
diff --git a/wmCalClock/Src/xutils.c b/wmCalClock/Src/xutils.c
index 008afa577eba..51c82f4e60e0 100644
--- a/wmCalClock/Src/xutils.c
+++ b/wmCalClock/Src/xutils.c
@@ -28,6 +28,9 @@
*
*
*/
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/wmCalClock/autogen b/wmCalClock/autogen
new file mode 100755
index 000000000000..2a595ccfc9fd
--- /dev/null
+++ b/wmCalClock/autogen
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+AUTOMAKE="automake --add-missing"
+export AUTOMAKE
+
+exec autoreconf --install "$@"
diff --git a/wmCalClock/
configure.ac b/wmCalClock/
configure.ac
new file mode 100644
index 000000000000..1fd775c8d4b4
--- /dev/null
+++ b/wmCalClock/
configure.ac
@@ -0,0 +1,21 @@
+AC_INIT([wmCalClock], [1.25], [
wmake...@googlegroups.com])
+AC_PREREQ([2.69])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([1.13 no-dist-gzip dist-xz foreign subdir-objects tar-pax -Wall])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([Src/wmCalClock.c])
+
+AC_PROG_CC
+AC_PROG_INSTALL
+
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([xext], [xext])
+PKG_CHECK_MODULES([xpm], [xpm])
+
+AC_CHECK_LIB([nsl], [gethostbyname])
+AC_CHECK_LIB([socket], [connect])
+
+AC_CHECK_HEADERS([unistd.h])
+
+AC_CONFIG_FILES([Makefile Src/Makefile])
+AC_OUTPUT
--
2.45.2