From 70854de371744a03edcedfb0c5ca9b8d32ef2119 Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 15 Jul 2017 23:54:45 -0400 Subject: [PATCH] wmbutton: Use autotools for build. --- wmbutton/Makefile | 39 --------------------------------------- wmbutton/Makefile.am | 9 +++++++++ wmbutton/configure.ac | 9 +++++++++ wmbutton/icons/Makefile.am | 2 ++ 4 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 wmbutton/Makefile create mode 100644 wmbutton/Makefile.am create mode 100644 wmbutton/configure.ac create mode 100644 wmbutton/icons/Makefile.am diff --git a/wmbutton/Makefile b/wmbutton/Makefile deleted file mode 100644 index 7738730..0000000 --- a/wmbutton/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -INCLUDES =-I/usr/include -I/usr/local/include -LIBINC =-L/usr/X11R6/lib -L/usr/include/lib -LIBS = -lX11 -lXpm -lXext - -TARGET = wmbutton -OBJECTS = wmbutton.o wmb_libs.o -DESTDIR = /usr/local -PREFIX = /usr -BINDIR = /bin -CONF = /etc -CONFFL = ${CONF}/wmbutton.conf -INSTALL = /usr/bin/install - -CFLAGS += -Wall -O2 -LDFLAGS += - -.c.o: - gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o - -${TARGET}: ${OBJECTS} - gcc -o ${TARGET} ${OBJECTS} ${LDFLAGS} ${LIBINC} ${LIBS} - -clean:: - for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done - if [ -e ${TARGET} ] ; then rm ${TARGET}; fi - if [ -e tags ]; then rm tags; fi - if [ -e core ]; then rm core; fi - -install:: - $(INSTALL) -d -m 0755 ${DESTDIR}${PREFIX}${BINDIR} ${DESTDIR}${CONF} - $(INSTALL) -p -o root -g root -m 755 wmbutton ${DESTDIR}${PREFIX}${BINDIR} - $(INSTALL) -p -o root -g root -m 644 sample.wmbutton ${DESTDIR}${CONFFL} - -wmbutton.o: wmbutton.c wmbutton.h Makefile - -wmb_libs.o: wmb_libs.c wmbutton.h Makefile - -tags: - ctags *.[ch] diff --git a/wmbutton/Makefile.am b/wmbutton/Makefile.am new file mode 100644 index 0000000..7c2b405 --- /dev/null +++ b/wmbutton/Makefile.am @@ -0,0 +1,9 @@ +SUBDIRS = icons +bin_PROGRAMS = wmbutton +dist_man_MANS = wmbutton.1 +dist_sysconf_DATA = wmbutton.conf +wmbutton_SOURCES = backdrop.xpm buttons.xpm mask.xbm wmb_libs.c wmbutton.c \ + wmbutton.h + +AM_CFLAGS = $(x11_CFLAGS) $(xpm_CFLAGS) $(xext_CFLAGS) +LIBS += $(x11_LIBS) $(xpm_LIBS) $(xext_LIBS) diff --git a/wmbutton/configure.ac b/wmbutton/configure.ac new file mode 100644 index 0000000..29bb88d --- /dev/null +++ b/wmbutton/configure.ac @@ -0,0 +1,9 @@ +AC_INIT([wmbutton], [0.7.0], [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([xpm], [xpm]) +PKG_CHECK_MODULES([xext], [xext]) +AC_CONFIG_FILES([Makefile icons/Makefile]) +AC_OUTPUT diff --git a/wmbutton/icons/Makefile.am b/wmbutton/icons/Makefile.am new file mode 100644 index 0000000..16ce9cf --- /dev/null +++ b/wmbutton/icons/Makefile.am @@ -0,0 +1,2 @@ +dist_pkgdata_DATA = audio.xpm blankbutton.xpm buttons2.xpm edit.xpm ftp.xpm \ + graph.xpm gv.xpm netscape.xpm paint.xpm wp.xpm xterm.xpm -- 2.11.4.GIT