[Antiright-devel] antiright Makefile configure rootcat/Makefile x...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 08/10/26 00:18:40

Modified files:
        .              : Makefile configure 
        rootcat        : Makefile 
        xshell         : Makefile 

Log message:
        Fixed xshell and rootcat compilation on CYGWIN.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/antiright/rootcat/Makefile?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/Makefile?cvsroot=antiright&r1=1.8&r2=1.9

Patches:
Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- Makefile    24 Oct 2008 06:06:18 -0000      1.23
+++ Makefile    26 Oct 2008 00:18:39 -0000      1.24
@@ -32,8 +32,10 @@
        cd gtkshell && $(MAKE)
        cd ACE-desktop && $(MAKE)
        $(XSHELL_BUILD) clean
-       #cd xshell && $(MAKE)
-#      cd rootcat && $(MAKE)
+ifneq ($(OS),MINGW)
+       cd xshell && $(MAKE)
+       cd rootcat && $(MAKE)
+endif
 ctags:
        ctags -w */*.[ch] ACE-desktop/ACE
 

Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- configure   26 Oct 2008 00:02:37 -0000      1.117
+++ configure   26 Oct 2008 00:18:39 -0000      1.118
@@ -181,6 +181,7 @@
 echo "YACC=$YACC" >> config.mk
 echo "XSHELL_BUILD=$XSHELL_BUILD" >> config.mk
 echo "AS=$AS" >> config.mk
+echo "OS"=$OSNAME >> config.mk
 if [ "$WINDOWS" = "TRUE" ]; then
        SUFFIX='.exe'
 else

Index: rootcat/Makefile
===================================================================
RCS file: /sources/antiright/antiright/rootcat/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- rootcat/Makefile    15 Jan 2008 18:20:56 -0000      1.2
+++ rootcat/Makefile    26 Oct 2008 00:18:39 -0000      1.3
@@ -26,8 +26,12 @@
 include ../config.mk
 
 PROG=rootcat
+
 INCLUDES=-I/usr/pkg/include/freetype2 -I/usr/X11R6/include/freetype2 
 INCLUDES+=-I/usr/pkg/include -I/usr/X11R6/include
+# This is for CYGWIN:
+INCLUDES+=-I/usr/include/freetype2
+
 LDFLAGS=-L/usr/pkg/lib -L/usr/X11R6/lib -lX11 -lXft -lXext
 CFLAGS+=$(INCLUDES)
 CFLAGS+=-g3

Index: xshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/xshell/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- xshell/Makefile     21 Jan 2008 11:56:32 -0000      1.8
+++ xshell/Makefile     26 Oct 2008 00:18:39 -0000      1.9
@@ -29,6 +29,9 @@
 # as they are GTK-specific.  
 
 INCLUDES=-I/usr/X11R6/include -I/usr/pkg/include
+# This is for CYGWIN:
+INCLUDES+=-I/usr/include/freetype2/freetype/config
+
 CFLAGS=$(INCLUDES) 
 CFLAGS+=-Os
 CFLAGS+=-DXSH_DECORATE