---
wmmoonclock/Makefile.am | 12 ++++++++++++
wmmoonclock/configure.ac | 9 +++++++++
wmmoonclock/src/Makefile | 37 -------------------------------------
wmmoonclock/src/wmMoonClock.c | 7 +------
4 files changed, 22 insertions(+), 43 deletions(-)
create mode 100644 wmmoonclock/Makefile.am
create mode 100644 wmmoonclock/configure.ac
delete mode 100644 wmmoonclock/src/Makefile
diff --git a/wmmoonclock/Makefile.am b/wmmoonclock/Makefile.am
new file mode 100644
index 0000000..3b5bf6f
--- /dev/null
+++ b/wmmoonclock/Makefile.am
@@ -0,0 +1,12 @@
+bin_PROGRAMS = wmmoonclock
+dist_man_MANS = src/wmMoonClock.1
+wmmoonclock_SOURCES = src/CalcEphem.c src/CalcEphem.h src/Moon.c src/Moon.h \
+ src/MoonRise.c src/MoonRise.h src/wmMoonClock.c \
+ src/wmMoonClock_mask.xbm \
+ src/wmMoonClock_masterLow.xpm \
+ src/wmMoonClock_master.xpm \
+ src/xutils.c src/xutils.h
+EXTRA_DIST = BUGS
+
+AM_CFLAGS = $(x11_CFLAGS) $(xext_CFLAGS) $(xpm_CFLAGS)
+LIBS += $(x11_LIBS) $(xext_LIBS) $(xpm_LIBS) -lm
diff --git a/wmmoonclock/configure.ac b/wmmoonclock/configure.ac
new file mode 100644
index 0000000..b1fdb51
--- /dev/null
+++ b/wmmoonclock/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wmmoonclock], [1.28], [wmaker-dev@lists.windowmaker.org])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_PROG_CC
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([xext], [xext])
+PKG_CHECK_MODULES([xpm], [xpm])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/wmmoonclock/src/Makefile b/wmmoonclock/src/Makefile
deleted file mode 100644
index da08654..0000000
--- a/wmmoonclock/src/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-CC = gcc
-# CFLAGS = -O2
-INCDIR = -I/usr/X11R6/include/X11
-DESTDIR= /usr/X11R6
-LIBDIR = -L/usr/X11R6/lib
-
-# for Linux
-LIBS = -lXpm -lX11 -lXext -lm
-
-# for Solaris
-# LIBS = -lXpm -lX11 -lXext -lm -lsocket
-
-OBJS = wmMoonClock.o CalcEphem.o Moon.o MoonRise.o \
- xutils.o
-
-
-.c.o:
- $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-
-
-all: wmMoonClock.o wmMoonClock
-
-wmMoonClock.o: wmMoonClock_master.xpm wmMoonClock_mask.xbm CalcEphem.h
-wmMoonClock: $(OBJS)
- $(CC) $(CFLAGS) $(SYSTEM) -o wmMoonClock $^ $(INCDIR) $(LIBDIR) $(LIBS)
-
-clean:
- for i in $(OBJS) ; do \
- rm -f $$i; \
- done
- rm -f wmMoonClock
-
-install:: wmMoonClock
- install -d -m 0755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1
- install -m 0755 wmMoonClock $(DESTDIR)/usr/bin
- install -m 0644 wmMoonClock.1 $(DESTDIR)/usr/share/man/man1
-
diff --git a/wmmoonclock/src/wmMoonClock.c b/wmmoonclock/src/wmMoonClock.c
index af9bdbb..e5316d0 100644
--- a/wmmoonclock/src/wmMoonClock.c
+++ b/wmmoonclock/src/wmMoonClock.c
@@ -124,11 +124,6 @@
* Delay between refreshes (in microseconds)
*/
#define DELAY 1000000L
-#define WMMOONCLOCK_VERSION "1.27"
-
-
-
-
void ParseCMDLine(int argc, char *argv[]);
void pressEvent(XButtonEvent *xev);
@@ -847,7 +842,7 @@ void ParseCMDLine(int argc, char *argv[]) {
void print_usage(){
- printf("\nwmMoonClock version: %s\n", WMMOONCLOCK_VERSION);
+ printf("\nwmMoonClock version: %s\n", PACKAGE_VERSION);
printf("\nusage: wmMoonClock [-display <Display>] [-lat <Latitude>] [-lon
<Longitude>] [-h]\n");
printf(" [-bc <Color>] [-lc <Color>] [-dc <Color>]\n\n");
printf("\t-display <Display>\tUse alternate X display.\n");
--
2.11.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
