[PATCH 1/4] wmifs: Switch to autotools for build.

Doug Torrance <[email protected]>
Newsgroups gmane.compw.window-managers.windowmaker.devel
Message-ID <[email protected]>
---
 wmifs/Makefile     | 42 ------------------------------------------
 wmifs/Makefile.am  |  7 +++++++
 wmifs/autogen.sh   |  2 ++
 wmifs/configure.ac |  9 +++++++++
 4 files changed, 18 insertions(+), 42 deletions(-)
 delete mode 100644 wmifs/Makefile
 create mode 100644 wmifs/Makefile.am
 create mode 100755 wmifs/autogen.sh
 create mode 100644 wmifs/configure.ac

diff --git a/wmifs/Makefile b/wmifs/Makefile
deleted file mode 100644
index 139877d..0000000
--- a/wmifs/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-prefix =/usr/local
-bindir=${prefix}/bin
-datarootdir=${prefix}/share
-mandir=${datarootdir}/man
-man1dir=${mandir}/man1
-CONF=/etc
-
-CC     = gcc
-LIBS   = -lXpm -lXext -lX11 -ldockapp
-OBJS =	wmifs.o
-
-CFLAGS = -Wall -O2 -g
-
-INSTALL = /usr/bin/install
-INSTALL_DIR     = $(INSTALL) -p -d -o root -g root -m 755
-INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
-INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
-
-.c.o:
-	$(CC) -DCONF=\"$(CONF)\" $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
-
-wmifs: $(OBJS)
-	$(CC) $(LDFLAGS) -o wmifs $^ $(LIBS)
-
-all:: wmifs
-
-clean::
-	for i in $(OBJS) ; do \
-		rm -f $$i ; \
-	done
-	rm -f wmifs
-
-install::
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_DIR) $(DESTDIR)$(CONF)
-	$(INSTALL_DIR) $(DESTDIR)$(man1dir)
-	$(INSTALL_PROGRAM) wmifs $(DESTDIR)$(bindir)
-	$(INSTALL_FILE) sample.wmifsrc $(DESTDIR)$(CONF)/wmifsrc
-	$(INSTALL_FILE) wmifs.1 $(DESTDIR)$(man1dir)
-	@echo "WMiFS installation finished..."
-	@echo " "
-	@echo "have fun! ;-)"
diff --git a/wmifs/Makefile.am b/wmifs/Makefile.am
new file mode 100644
index 0000000..476a848
--- /dev/null
+++ b/wmifs/Makefile.am
@@ -0,0 +1,7 @@
+bin_PROGRAMS = wmifs
+dist_man_MANS = wmifs.1
+EXTRA_DIST = BUGS CHANGES HINTS sample.wmifsrc wmifs-mask.xbm wmifs-master.xpm
+
+AM_CPPFLAGS = -DCONF=\"@sysconfdir@\"
+AM_CFLAGS = $(x11_CFLAGS) $(xpm_CFLAGS) $(dockapp_CFLAGS)
+LIBS += $(x11_LIBS) $(xpm_LIBS) $(dockapp_LIBS)
diff --git a/wmifs/autogen.sh b/wmifs/autogen.sh
new file mode 100755
index 0000000..af8c78c
--- /dev/null
+++ b/wmifs/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf --force --verbose --install
diff --git a/wmifs/configure.ac b/wmifs/configure.ac
new file mode 100644
index 0000000..ab92d2f
--- /dev/null
+++ b/wmifs/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wmifs], [1.6], [[email protected]])
+AM_INIT_AUTOMAKE([foreign])
+AC_CONFIG_SRCDIR([configure.ac])
+AC_PROG_CC
+PKG_CHECK_MODULES([x11], [x11])
+PKG_CHECK_MODULES([xpm], [xpm])
+PKG_CHECK_MODULES([dockapp], [dockapp])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
-- 
2.5.0


-- 
To unsubscribe, send mail to [email protected].
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.