The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/GIFPlot/Lib/.cvsignore

@@ -0,0 +1 @@
+Makefile

Examples/GIFPlot/Lib/Makefile.in

@@ -1,14 +1,14 @@
 CC      = @CC@
-INCLUDE = -I../Include
+INCLUDES= -I../Include
 CFLAGS  = -O
 SRCS    = frame.c color.c plot2d.c plot3d.c font.c pixmap.c matrix.c gif.c
-OBJS    = $(SRCS:.c=.o)
+OBJS    = $(SRCS:.c=.@OBJEXT@)
 AR      = @AR@
 RANLIB  = @RANLIB@
 TARGET  = ../libgifplot.a
 
-.c.o: 
-	$(CC) $(INCLUDE) $(CFLAGS) -c -o $*.o $<
+.c.@OBJEXT@: 
+	$(CC) $(INCLUDES) $(CFLAGS) -c -o $*.@OBJEXT@ $<
 
 all:  $(OBJS)
 	@rm -f ../libgifplot.a
@@ -16,6 +16,6 @@ all:  $(OBJS)
 	$(RANLIB) $(TARGET)
 
 clean:
-	rm -f *.o *~ $(TARGET)
-
+	rm -f *.@OBJEXT@ *~ $(TARGET)
 
+check: all

Examples/GIFPlot/Lib/pixmap.c

@@ -99,10 +99,10 @@ FrameBuffer_drawpixmap(FrameBuffer *f, PixMap *pm, int x, int y, int fgcolor, in
     for (i = startx; i < endx; i++) {
       c = pm->map[py*pm->width + px];
       switch (c) {
-      case FOREGROUND:
+      case GIFPLOT_FOREGROUND:
 	f->pixels[j][i] = fgcolor;
 	break;
-      case BACKGROUND:
+      case GIFPLOT_BACKGROUND:
 	f->pixels[j][i] = bgcolor;
 	break;
       default: