[Pkg-wmaker-commits] [wmitime] 106/127: wmitime: Update Makefile.

[Doug Torrance]

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

dtorrance-guest pushed a commit to branch master
in repository wmitime.

commit d3130952d6da389a37f917b8c8eee8d16c3408ae
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Dec 20 01:57:03 2014 -0600

    wmitime: Update Makefile.
    
    In particular,
    - Remove reference to deprecated X11R6 directory.
    - Replace FLAGS variable with CFLAGS, CPPFLAGS, and LDFLAGS.
    - Honor CC, PREFIX, and DESTDIR variables.
    - Use INSTALL instead of cp for installation.
    - Remove redundant -lXext flag.
    - Move contents of wmitime directory to top directory to ease the building
      process.
    
    Inspired in part by the Debian patches [1,2].
    
    [1] http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/patches/20-makefile-CC.patch/
    [2] http://sources.debian.net/src/wmitime/0.3%2B20120605-1/debian/patches/make-install.patch/
---
 Makefile                                           | 30 ++++++++++++++
 README                                             |  1 -
 wmitime/french.h => french.h                       |  0
 wmitime/language.h => language.h                   |  0
 ...mitime-master-led.xpm => wmitime-master-led.xpm |  0
 wmitime/wmitime-master.xpm => wmitime-master.xpm   |  0
 wmitime/wmitime.c => wmitime.c                     |  4 +-
 wmitime/Makefile                                   | 47 ----------------------
 8 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c928067
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+#LANG = fr
+LIBS   = -lXpm -lXext -lX11 -lm
+CFLAGS = -O2 -Wall
+OBJS =	wmitime.o \
+		wmgeneral/wmgeneral.o \
+		wmgeneral/misc.o \
+		wmgeneral/list.o
+INSTALL = install
+PREFIX = /usr/local
+BINDIR = $(PREFIX)/bin
+
+.c.o:
+	$(CC) $(CPPFLAGS) $(CFLAGS) -D$(LANG) -c $< -o $*.o
+
+wmitime: $(OBJS)
+	$(CC) $(LDFLAGS) -o wmitime $^ $(LIBS)
+
+all:: wmtime
+
+clean::
+	for i in $(OBJS) ; do \
+		rm -f $$i ; \
+	done
+	rm -f wmitime
+	rm -f *~
+
+install:: wmitime
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) wmitime $(DESTDIR)$(BINDIR)
+	@echo "wmitime Installation finished..."
diff --git a/README b/README
index 1b8caf2..c26ffa8 100644
--- a/README
+++ b/README
@@ -20,7 +20,6 @@ Let me know what you think of it. ;)
 
 Installing
 --------------------------------------------------------------
-cd wmitime
 make
 make install
 
diff --git a/wmitime/french.h b/french.h
similarity index 100%
rename from wmitime/french.h
rename to french.h
diff --git a/wmitime/language.h b/language.h
similarity index 100%
rename from wmitime/language.h
rename to language.h
diff --git a/wmitime/wmitime-master-led.xpm b/wmitime-master-led.xpm
similarity index 100%
rename from wmitime/wmitime-master-led.xpm
rename to wmitime-master-led.xpm
diff --git a/wmitime/wmitime-master.xpm b/wmitime-master.xpm
similarity index 100%
rename from wmitime/wmitime-master.xpm
rename to wmitime-master.xpm
diff --git a/wmitime/wmitime.c b/wmitime.c
similarity index 99%
rename from wmitime/wmitime.c
rename to wmitime.c
index c4b87f3..e72d16a 100644
--- a/wmitime/wmitime.c
+++ b/wmitime.c
@@ -28,8 +28,8 @@
 #include <X11/xpm.h>
 #include <X11/extensions/shape.h>
 
-#include "../wmgeneral/wmgeneral.h"
-#include "../wmgeneral/misc.h"
+#include "wmgeneral/wmgeneral.h"
+#include "wmgeneral/misc.h"
 
 #ifdef fr_FR
 #define fr
diff --git a/wmitime/Makefile b/wmitime/Makefile
deleted file mode 100644
index 1b1185d..0000000
--- a/wmitime/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#LANG = fr
-LIBDIR = -L/usr/X11R6/lib
-LIBS   = -lXpm -lXext -lX11 -lm
-FLAGS = -O2
-OBJS =	wmitime.o \
-		../wmgeneral/wmgeneral.o \
-		../wmgeneral/misc.o \
-		../wmgeneral/list.o
-
-
-.c.o:
-	cc -I/usr/X11R6/share/include $(FLAGS) -D$(LANG) -c -Wall $< -o $*.o
-
-wmtime: $(OBJS)
-	cc $(FLAGS) -D$(LANG) -o wmitime $^ -lXext $(LIBDIR) $(LIBS)
-
-all:: wmtime
-
-clean::
-	for i in $(OBJS) ; do \
-		rm -f $$i ; \
-	done
-	rm -f wmitime
-	rm -f *~
-
-install:: wmitime
-	cp -f wmitime /usr/local/bin/
-	chmod 755 /usr/local/bin/wmitime
-	chown root:root /usr/local/bin/wmitime
-#	cp wminetrc $(HOME)/.wminetrc
-#	chmod 600 $(HOME)/.wminetrc
-#	cp wminetrc /etc/wminetrc
-#	chmod 644 /etc/wminetrc
-	@echo "wmitime Installation finished..."
-
-
-
-
-
-
-
-
-
-
-
-
-

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