[PATCH 06/12] wmbutton: Better Makefile

[Rodolfo García Peñas]

>From 266ce107a11595a5ce828f896bac0f61aa5f9e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Tue, 21 Aug 2012 20:32:07 +0200
Subject: [PATCH 06/12] wmbutton: Better Makefile

This patch is based in the code wrote by Christian Aichinger
for the Debian distribution.

Changes are:

- Removed the compilation of ctags by default
- Changed the include /usr/X11R6/include/X11 to /usr/include
- Created install option
---
 wmbutton/Makefile |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/wmbutton/Makefile b/wmbutton/Makefile
index b4b744d..8dbd22d 100644
--- a/wmbutton/Makefile
+++ b/wmbutton/Makefile
@@ -1,16 +1,23 @@
-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include 
-I/usr/include/X11R6/X11
+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
-
-CFLAGS += -c -Wall -O2
-
-all: ${TARGET} tags
+DESTDIR =
+PREFIX = /usr/local
+BINDIR = ${PREFIX}/bin
+MANDIR = ${PREFIX}/share/man
+CONF   = /etc
+CONFFL = ${CONF}/wmbutton.conf
+INSTALL = /usr/bin/install
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
+
+CFLAGS += -Wall -O2
 
 .c.o:
-       gcc ${CFLAGS} ${INCLUDES} $< -o $*.o
+       gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o
 
 ${TARGET}: ${OBJECTS}
        gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
@@ -21,6 +28,10 @@ clean::
        if [ -e tags ]; then rm tags; fi
        if [ -e core ]; then rm core; fi
 
+install::
+       ${INSTALL_PROGRAM} wmbutton ${DESTDIR}${BINDIR}
+       ${INSTALL_FILE} sample.wmbutton ${DESTDIR}${CONFFL}
+
 wmbutton.o: wmbutton.c wmbutton.h Makefile
 
 wmb_libs.o: wmb_libs.c wmbutton.h Makefile
-- 
1.7.10.4

-- 
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/

>From 266ce107a11595a5ce828f896bac0f61aa5f9e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <k...@kix.es>
Date: Tue, 21 Aug 2012 20:32:07 +0200
Subject: [PATCH 06/12] wmbutton: Better Makefile

This patch is based in the code wrote by Christian Aichinger
for the Debian distribution.

Changes are:

- Removed the compilation of ctags by default
- Changed the include /usr/X11R6/include/X11 to /usr/include
- Created install option
---
 wmbutton/Makefile |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/wmbutton/Makefile b/wmbutton/Makefile
index b4b744d..8dbd22d 100644
--- a/wmbutton/Makefile
+++ b/wmbutton/Makefile
@@ -1,16 +1,23 @@
-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
+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
-
-CFLAGS += -c -Wall -O2
-
-all: ${TARGET} tags
+DESTDIR =
+PREFIX = /usr/local
+BINDIR = ${PREFIX}/bin
+MANDIR = ${PREFIX}/share/man
+CONF   = /etc
+CONFFL = ${CONF}/wmbutton.conf
+INSTALL = /usr/bin/install
+INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
+
+CFLAGS += -Wall -O2
 
 .c.o:
-	gcc ${CFLAGS} ${INCLUDES} $< -o $*.o
+	gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o
 
 ${TARGET}: ${OBJECTS}
 	gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
@@ -21,6 +28,10 @@ clean::
 	if [ -e tags ]; then rm tags; fi
 	if [ -e core ]; then rm core; fi
 
+install::
+	${INSTALL_PROGRAM} wmbutton ${DESTDIR}${BINDIR}
+	${INSTALL_FILE} sample.wmbutton ${DESTDIR}${CONFFL}
+
 wmbutton.o: wmbutton.c wmbutton.h Makefile
 
 wmb_libs.o: wmb_libs.c wmbutton.h Makefile
-- 
1.7.10.4