Hi everyone,

I've attached a patch for wmtime in the dockapps repo.  It came from
John Paul Adrian Glaubitz, who recently helped me adopt the Debian
package.  (I'm the guy who originally said he'd adopt wmtime.  It took
me a while, but I did it!)

I've also adopted wmclock and am in the process of adopting wmsystemtray
(which is currently not in Debian).  I know kix has a long list of
orphaned dockapps, and as I get more comfortable with packaging, I plan
on adopting some more.

I have a question, as well.  Should I be submitting patches for changes
to the debian directory?  Should we even have debian directories in git?

Thanks,
Doug


From 6a5337d242bf11f6be53ce8cc6a6ddd48a0851c5 Mon Sep 17 00:00:00 2001
From: Doug Torrance <[email protected]>
Date: Sun, 22 Sep 2013 09:49:01 -0500
Subject: [PATCH] wmtime - Fix compiler and linker flags in Makefile.

The Makefile of wmtime had to be patched in order for CFLAGS
not to be redefined by the Makefile but to use the CFLAGS
passed by debhelper and add additional flags through
string concatenation. LDFLAGS and CPPFLAGS weren't passed
at all and have been added to the linker command line.

Patch by John Paul Adrian Glaubitz <[email protected]>,
from Debian package.
---
 wmtime/wmtime/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wmtime/wmtime/Makefile b/wmtime/wmtime/Makefile
index 26b8571..a1c3c58 100755
--- a/wmtime/wmtime/Makefile
+++ b/wmtime/wmtime/Makefile
@@ -7,13 +7,13 @@ OBJS =	wmtime.o \
 XPMS = wmtime-master.xpm wmtime-mask.xbm
 
 CC = gcc
-CFLAGS = -O2
+CFLAGS += -O2
 
 .c.o:
-	$(CC) $(CFLAGS) -c -Wall $< -o $*.o
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -c -Wall $< -o $*.o
 
 wmtime: $(OBJS) $(XPMS)
-	$(CC) $(CFLAGS) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o wmtime $(OBJS) $(LIBDIR) $(LIBS)
 
 clean::
 	for i in $(OBJS) ; do \
-- 
1.8.1.2

Reply via email to