[Pkg-wmaker-commits] [wmtime] 15/101: wmtime: Move source files to top directory.

[Doug Torrance]

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

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

commit ee227d30818723b26bc5570c8fbf85b155539134
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date:   Sat Jan 3 16:16:17 2015 -0600

    wmtime: Move source files to top directory.
    
    Ease the build process by skipping the initial "cd wmtime" step.  Document
    this in INSTALL.
---
 INSTALL                                       | 7 +++----
 wmtime/Makefile => Makefile                   | 6 +++---
 wmtime/wmtime-mask.xbm => wmtime-mask.xbm     | 0
 wmtime/wmtime-master.xpm => wmtime-master.xpm | 0
 wmtime/wmtime.1 => wmtime.1                   | 0
 wmtime/wmtime.c => wmtime.c                   | 4 ++--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index 94943c4..813a6e0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,11 +8,10 @@ Nothing particular, but a computer might come in handy doh ;-)
 Installation
 --------------------------------------------------------------
 1)  % tar -zxvf wmtime-1.1.tar.gz
-2)  % cd wmtime/wmtime
-3)  % make
-4)  % make install (as root)
+2)  % make
+3)  % make install (as root)
 
-5)* WMTime uses month and weekday abbreviations from the
+4)* WMTime uses month and weekday abbreviations from the
     currently set locale.  If these abbreviations do not
     use Latin alphabet characters, then WMTime defaults to
     US/English.
diff --git a/wmtime/Makefile b/Makefile
similarity index 85%
rename from wmtime/Makefile
rename to Makefile
index 35ac1ba..0b3ce5c 100755
--- a/wmtime/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 LIBDIR = -L/usr/X11R6/lib
 LIBS   = -lXpm -lXext -lX11 -lm
 OBJS =	wmtime.o \
-		../wmgeneral/wmgeneral.o \
-		../wmgeneral/misc.o \
-		../wmgeneral/list.o
+		wmgeneral/wmgeneral.o \
+		wmgeneral/misc.o \
+		wmgeneral/list.o
 XPMS = wmtime-master.xpm wmtime-mask.xbm
 
 CC = gcc
diff --git a/wmtime/wmtime-mask.xbm b/wmtime-mask.xbm
similarity index 100%
rename from wmtime/wmtime-mask.xbm
rename to wmtime-mask.xbm
diff --git a/wmtime/wmtime-master.xpm b/wmtime-master.xpm
similarity index 100%
rename from wmtime/wmtime-master.xpm
rename to wmtime-master.xpm
diff --git a/wmtime/wmtime.1 b/wmtime.1
similarity index 100%
rename from wmtime/wmtime.1
rename to wmtime.1
diff --git a/wmtime/wmtime.c b/wmtime.c
similarity index 99%
rename from wmtime/wmtime.c
rename to wmtime.c
index 2c4f6e8..2bb9c5c 100644
--- a/wmtime/wmtime.c
+++ b/wmtime.c
@@ -78,8 +78,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"
 
 #include "wmtime-master.xpm"
 #include "wmtime-mask.xbm"

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