---
wmix/INSTALL | 9 +++++----
wmix/Makefile | 20 --------------------
wmix/Makefile.am | 9 +++++++++
wmix/configure.ac | 15 +++++++++++++++
wmix/include/config.h | 3 ---
5 files changed, 29 insertions(+), 27 deletions(-)
delete mode 100644 wmix/Makefile
create mode 100644 wmix/Makefile.am
create mode 100644 wmix/configure.ac
diff --git a/wmix/INSTALL b/wmix/INSTALL
index 46f0d2d..17cc77b 100644
--- a/wmix/INSTALL
+++ b/wmix/INSTALL
@@ -1,9 +1,10 @@
Since your reading this, you are probably done with the tar zxvf part.
-1. make
-2. become root
-3. make install
-4. wmix
+1. ./configure
+2. make
+3. become root
+4. make install
+5. wmix
pretty easy. See README for instructions on how to use the mixer and about
some information on the programming involved. See the man page (man wmix)
diff --git a/wmix/Makefile b/wmix/Makefile
deleted file mode 100644
index d62273c..0000000
--- a/wmix/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-CC = gcc
-CFLAGS = -std=gnu99 -O3 -W -Wall `pkg-config --cflags alsa xrandr`
-LDFLAGS = -L/usr/X11R6/lib
-LIBS = -lXpm -lXext -lX11 -lm `pkg-config --libs alsa xrandr`
-OBJECTS = misc.o config.o mixer-alsa.o mixer-oss.o ui_x.o
mmkeys.o wmix.o
-
-# where to install this program (also for packaging stuff)
-PREFIX = /usr/local
-INSTALL_BIN = -m 755
-INSTALL_DATA = -m 644
-
-wmix: $(OBJECTS)
- $(CC) -o $@ $(LDFLAGS) $(OBJECTS) $(LIBS)
-
-clean:
- rm -rf *.o wmix *~
-
-install: wmix
- install $(INSTALL_BIN) wmix $(PREFIX)/bin
- install $(INSTALL_DATA) wmix.1x $(PREFIX)/man/man1
diff --git a/wmix/Makefile.am b/wmix/Makefile.am
new file mode 100644
index 0000000..f8f6ba2
--- /dev/null
+++ b/wmix/Makefile.am
@@ -0,0 +1,9 @@
+bin_PROGRAMS = wmix
+wmix_SOURCES = misc.c config.c mixer-alsa.c mixer-oss.c ui_x.c mmkeys.c wmix.c
\
+ include/common.h include/config.h include/led-off.xpm \
+ include/led-on.xpm include/master.xpm include/misc.h \
+ include/mixer-alsa.h include/mixer.h include/mixer-oss.h \
+ include/mmkeys.h include/ui_x.h
+
+dist_man_MANS = wmix.1x
+EXTRA_DIST = BUGS sample.wmixrc
diff --git a/wmix/configure.ac b/wmix/configure.ac
new file mode 100644
index 0000000..e0d2bb4
--- /dev/null
+++ b/wmix/configure.ac
@@ -0,0 +1,15 @@
+AC_INIT([wmix], [3.2], [wmaker-dev@lists.windowmaker.org])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([wmix.c])
+
+AC_PROG_CC
+
+AC_CHECK_LIB([asound], [snd_mixer_selem_get_playback_switch])
+AC_CHECK_LIB([m], [cos])
+AC_CHECK_LIB([X11], [XOpenDisplay])
+AC_CHECK_LIB([Xext], [XShapeCombineMask])
+AC_CHECK_LIB([Xpm], [XpmCreatePixmapFromData])
+AC_CHECK_LIB([Xrandr], [XRRQueryExtension])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
diff --git a/wmix/include/config.h b/wmix/include/config.h
index d916fa2..edb571a 100644
--- a/wmix/include/config.h
+++ b/wmix/include/config.h
@@ -49,9 +49,6 @@ extern struct _Config {
/* Default color for OSD */
extern const char default_osd_color[];
-/* Current version of WMixer */
-#define VERSION "3.2"
-
/* Sets the default values in the config */
void config_init(void);
--
2.11.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
