[Antiright-devel] antiright ACE-desktop/Makefile ACE-desktop/date...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/09 16:40:14

Modified files:
        ACE-desktop    : Makefile dateload.c 
        libantiright   : library.h 

Log message:
        Set up dateload build to link to libantiright.a and glib.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/Makefile?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/dateload.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.3&r2=1.4

Patches:
Index: ACE-desktop/Makefile
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ACE-desktop/Makefile        4 Feb 2007 06:58:18 -0000       1.3
+++ ACE-desktop/Makefile        9 Feb 2007 16:40:14 -0000       1.4
@@ -24,9 +24,10 @@
 
 include ../config.mk
 
-
+CFLAGS+=$(DEFS) `pkg-config --cflags glib-2.0`
+LIBS+=`pkg-config --libs glib-2.0` ../libantiright/libantiright.a
 all: dateload.o
-       cc -o dateload dateload.o
+       cc -o dateload dateload.o $(LIBS)
        echo '#!/bin/sh' > ACE.install
        grep ^PREFIX ../config.mk >> ACE.install
        cat ACE >> ACE.install

Index: ACE-desktop/dateload.c
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/dateload.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ACE-desktop/dateload.c      9 Feb 2007 03:16:12 -0000       1.2
+++ ACE-desktop/dateload.c      9 Feb 2007 16:40:14 -0000       1.3
@@ -1,8 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-
-#define UNUSED(arg) { arg=arg; }
+#include "../libantiright/library.h"
 
 int main(int argc, char **argv)
 {
@@ -18,7 +17,7 @@
        
        getloadavg(loadavg, 3);
 
-       printf(" %s %.2f, %.2f, %.2f",
+       g_print(" %s %.2f, %.2f, %.2f",
                date, loadavg[0], loadavg[1], loadavg[2]);
 
        return(0);

Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libantiright/library.h      9 Feb 2007 16:28:34 -0000       1.3
+++ libantiright/library.h      9 Feb 2007 16:40:14 -0000       1.4
@@ -1,7 +1,6 @@
-
 /*
   AntiRight
-  (c) 2002-2006 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
  
   This file is part of AntiRight.