[Pkg-wmaker-commits] [wmifs] 02/08: wmifs: Switch to autotools for build.

Doug Torrance dtorrance-guest at moszumanska.debian.org
Wed Apr 20 11:03:24 UTC 2016


This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository wmifs.

commit 3932ebae79d0de36ed485afa19c040a8d652597b
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Tue Apr 19 16:48:27 2016 -0400

    wmifs: Switch to autotools for build.
---
 Makefile     | 42 ------------------------------------------
 Makefile.am  |  7 +++++++
 autogen.sh   |  2 ++
 configure.ac |  9 +++++++++
 4 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 139877d..0000000
--- a/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/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..476a848
--- /dev/null
+++ b/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/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..af8c78c
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+autoreconf --force --verbose --install
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..ab92d2f
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,9 @@
+AC_INIT([wmifs], [1.6], [wmaker-dev at lists.windowmaker.org])
+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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmifs.git



More information about the Pkg-wmaker-commits mailing list