---
wmmon/Makefile | 21 ---------------------
wmmon/Makefile.am | 7 +++++++
wmmon/configure.ac | 8 ++++++++
wmmon/wmmon.c | 3 +--
4 files changed, 16 insertions(+), 23 deletions(-)
delete mode 100644 wmmon/Makefile
create mode 100644 wmmon/Makefile.am
create mode 100644 wmmon/configure.ac
diff --git a/wmmon/Makefile b/wmmon/Makefile
deleted file mode 100644
index 3522cef..0000000
--- a/wmmon/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-LIBDIR = -L/usr/X11R6/lib -L/usr/local/lib
-LIBS = -lXpm -lXext -lX11 -ldockapp
-OBJS = wmmon.o
-
-CFLAGS = -O2
-CC = cc
-
-.c.o:
- $(CC) $(CFLAGS) -c -Wall $< -o $*.o
-
-wmmon: $(OBJS)
- $(CC) $(LDFLAGS) -o wmmon $^ $(LIBDIR) $(LIBS)
-
-debug: CFLAGS = -g3
-debug: wmmon
-
-clean::
- for i in $(OBJS) ; do \
- rm -f $$i;\
- done
- rm -f wmmon
diff --git a/wmmon/Makefile.am b/wmmon/Makefile.am
new file mode 100644
index 0000000..2607302
--- /dev/null
+++ b/wmmon/Makefile.am
@@ -0,0 +1,7 @@
+bin_PROGRAMS = wmmon
+dist_man_MANS = wmmon.1
+wmmon_SOURCES = wmmon.c wmmon-mask.xbm wmmon-master.xpm
+EXTRA_DIST = BUGS CHANGES HINTS
+
+AM_CFLAGS = $(x11_CFLAGS) $(dockapp_CFLAGS)
+LIBS += $(x11_LIBS) $(dockapp_LIBS)
diff --git a/wmmon/configure.ac b/wmmon/configure.ac
new file mode 100644
index 0000000..045ac5a
--- /dev/null
+++ b/wmmon/configure.ac
@@ -0,0 +1,8 @@
+AC_INIT([wmmon], [1.2.b2], [wmaker-dev@lists.windowmaker.org])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_PROG_CC
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([dockapp], [dockapp])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/wmmon/wmmon.c b/wmmon/wmmon.c
index 43e6af5..b9e8447 100644
--- a/wmmon/wmmon.c
+++ b/wmmon/wmmon.c
@@ -117,7 +117,6 @@
/***********/
/* Defines */
/***********/
-#define WMMON_VERSION "1.2.b2"
#define HISTORY_ENTRIES 55
#define HISTORY_ENTRIES 55
#define MAX_CPU (10) /* depends on graph height */
@@ -1015,7 +1014,7 @@ void usage(char *name)
\*******************************************************************************/
void printversion(void)
{
- printf("WMMon version %s\n", WMMON_VERSION);
+ printf("WMMon version %s\n", PACKAGE_VERSION);
}
/* vim: sw=4 ts=4 columns=82
*/
--
2.11.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
