[Antiright-devel] antiright configure gtkshell/Makefile gtkshell/...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/05/26 16:02:28

Modified files:
        .              : configure 
        gtkshell       : Makefile add_options.c 

Log message:
        Sync repository, nothing to report though.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.39&r2=1.40

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- configure   21 May 2007 13:38:58 -0000      1.100
+++ configure   26 May 2007 16:02:28 -0000      1.101
@@ -90,6 +90,8 @@
        fi
 fi
 
+LDFLAGS="$LDFLAGS $(pkg-config --libs gtk+-2.0)"
+
 echo "# Local Build Configuration" > config.mk
 
 echo -n 'Checking for VTE...  '
@@ -98,6 +100,7 @@
        DEFS="$DEFS -DHAVE_VTE"
        echo 'VTE=1' >> config.mk
        INCLUDE="$INCLUDE $(pkg-config --cflags vte)"
+       LDFLAGS="$LDFLAGS $(pkg-config --libs vte)"
 else
        echo not found
 fi
@@ -108,6 +111,7 @@
        echo found
        echo 'LIBGC=1' >> config.mk
        DEFS="$DEFS -DLIBGC"
+       LDFLAGS="$LDFLAGS -lgc"
 else
        echo not found
 fi
@@ -129,4 +133,5 @@
 echo "INSTALL=$INSTALL" >> config.mk
 echo "CFLAGS=$CFLAGS" >> config.mk
 echo "CC=$CC" >> config.mk
+echo "LDFLAGS=$LDFLAGS" >> config.mk
 

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gtkshell/Makefile   21 May 2007 13:38:58 -0000      1.33
+++ gtkshell/Makefile   26 May 2007 16:02:28 -0000      1.34
@@ -25,22 +25,8 @@
 
 include ../config.mk
 
-#CFLAGS+=`pkg-config --cflags gtk+-2.0` -g3 -Wall -W -Werror
-#GTKFLAGS=`pkg-config --cflags gtk+-2.0` 
-#CFLAGS+=$(GTKFLAGS) $(DEFS)
 CFLAGS+=$(DEFS) $(INCLUDE)
 LDFLAGS+=-L../libantiright -lantiright
-LDFLAGS+=`pkg-config --libs gtk+-2.0`
-
-ifdef VTE
-CFLAGS+=-DHAVE_VTE
-#GTKFLAGS+=`pkg-config --cflags vte`
-LDFLAGS+=`pkg-config --libs vte`
-endif
-
-ifdef LIBGC
-LDFLAGS+=-lgc
-endif
 
 #LDFLAGS+=-lefence
 

Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gtkshell/add_options.c      21 May 2007 00:11:38 -0000      1.39
+++ gtkshell/add_options.c      26 May 2007 16:02:28 -0000      1.40
@@ -62,10 +62,11 @@
 {
        GtkWidget * separator;
 
-       /* Create a separator widget.  If GSH has one row per column, use a 
vertical
-          separator, else use a horizontal separator.  This allows the 
separator
-          to be used for ACE's Deskbar.  */
-       separator = (gsh->rows->total == 1) ? gtk_vseparator_new() : 
gtk_hseparator_new();
+       /* Create a separator widget.  If GSH has one row per column, 
+          use a vertical separator, else use a horizontal separator.  
+          This allows the separator to be used for ACE's Deskbar.  */
+       separator = (gsh->rows->total == 1) ? 
+               gtk_vseparator_new() : gtk_hseparator_new();
        /* Show and manage the separator.  */
        $(gsh, manage, separator);
 }
@@ -128,12 +129,7 @@
        switch(current_arg[3])
        {
        case 'c':  /* Add clock.  */
-       {
-               GtkWidget * clock;
-
-               clock=gsh_clock_new(gsh);
-               $(gsh, manage, clock);
-       }
+               $(gsh, manage, gsh_clock_new(gsh));
                break;
        default:
                ARWARN("invalid applet argument");