Moved FLI core routines from third_party/gfli to src/file/fli

makefile.gcc

@@ -10,7 +10,6 @@ CFLAGS += -Wall -I. -Isrc -Ithird_party \
 	  -I$(LIBFREETYPE_DIR)/include \
           -I$(LIBLUA_DIR)/include \
 	  -I$(LIBJPEG_DIR) \
-	  -I$(LIBGFLI_DIR) \
 	  -I$(LIBPNG_DIR) \
 	  -I$(ZLIB_DIR) \
 	  -Wno-deprecated-declarations \
@@ -60,10 +59,6 @@ $(LIBGD_LIB): $(LIBGD_OBJS)
 	-rm -f $@
 	ar rs $@ $^
 
-$(LIBGFLI_LIB): $(LIBGFLI_OBJS)
-	-rm -f $@
-	ar rs $@ $^
-
 $(LIBJPEG_LIB): $(LIBJPEG_OBJS)
 	-rm -f $@
 	ar rs $@ $^
@@ -91,6 +86,7 @@ VPATH = src					\
 	src/dialogs				\
 	src/effect				\
 	src/file				\
+	src/file/fli				\
 	src/file/gif				\
 	src/intl				\
 	src/jinete				\
@@ -119,7 +115,6 @@ VPATH = src					\
 	$(LIBFREETYPE_DIR)/src/type1		\
 	$(LIBFREETYPE_DIR)/src/winfonts		\
 	$(LIBGD_DIR)				\
-	$(LIBGFLI_DIR)				\
 	$(LIBJPEG_DIR)				\
 	$(LIBLUA_DIR)/src			\
 	$(LIBLUA_DIR)/src/lib			\
@@ -146,9 +141,6 @@ $(OBJ_DIR)/freetype.%$(OBJ): %.c
 $(OBJ_DIR)/gd.%$(OBJ): %.c
 	$(CC) $(CFLAGS) -DNONDLL -DHAVE_CONFIG_H -o $@ -c $<
 
-$(OBJ_DIR)/gfli.%$(OBJ): %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
 $(OBJ_DIR)/jpeg.%$(OBJ): %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 

makefile.lst

@@ -105,6 +105,7 @@ COMMON_SOURCES =					\
 	src/file/ase_format.c				\
 	src/file/bmp_format.c				\
 	src/file/file.c					\
+	src/file/fli/fli.c				\
 	src/file/fli_format.c				\
 	src/file/gif/format.c				\
 	src/file/gif/lzw.c				\
@@ -352,18 +353,6 @@ LIBGD_OBJS = $(addprefix $(OBJ_DIR)/gd.,			\
 	       $(addsuffix $(OBJ),				\
 		 $(notdir $(basename $(LIBGD_SOURCES)))))
 
-######################################################################
-# GFli
-
-LIBGFLI_LIB = $(OBJ_DIR)/libgfli$(LIB)
-LIBGFLI_DIR = third_party/gfli
-LIBGFLI_SOURCES =				\
-	$(LIBGFLI_DIR)/gfli.c
-
-LIBGFLI_OBJS = $(addprefix $(OBJ_DIR)/gfli.,						\
-			   $(addsuffix $(OBJ),						\
-				       $(notdir $(basename $(LIBGFLI_SOURCES)))))
-
 ######################################################################
 # Lua
 
@@ -510,7 +499,6 @@ ALL_OBJS =					\
 	$(ASE_OBJS)				\
 	$(LIBLUA_OBJS)				\
 	$(LIBFREETYPE_OBJS)			\
-	$(LIBGFLI_OBJS)				\
 	$(LIBART_OBJS)				\
 	$(LIBPNG_OBJS)				\
 	$(ZLIB_OBJS)
@@ -518,7 +506,6 @@ ALL_OBJS =					\
 THIRD_PARTY_LIBS =				\
 	$(LIBART_LIB)				\
 	$(LIBFREETYPE_LIB)			\
-	$(LIBGFLI_LIB)				\
 	$(LIBJPEG_LIB)				\
 	$(LIBLUA_LIB)				\
 	$(LIBPNG_LIB)				\

src/file/fli/fli.c

@@ -17,14 +17,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
- 
-/*
- * This code can be used to read and write FLI movies. It is currently
- * only used for the GIMP fli plug-in, but it can be used for other
- * programs, too.
- */
 
-/* Modified by David A. Capello to use with ASE.
+/* Modified by David A. Capello to use with ASE (2001-2008).
    See ../README.txt for more information
  */
  
@@ -32,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "gfli.h"
+#include "fli.h"
 
 /*
  * To avoid endian-problems I wrote these functions:

src/file/fli_format.c

@@ -22,12 +22,10 @@
 #include <stdio.h>
 
 #include "file/file.h"
+#include "file/fli/fli.h"
 #include "modules/palette.h"
 #include "raster/raster.h"
 
-/* GFLI header file */
-#include "gfli.h"
-
 static bool load_FLI(FileOp *fop);
 static bool save_FLI(FileOp *fop);
 

src/file/gif_format.c

@@ -30,11 +30,11 @@
 #include "jinete/jbase.h"
 
 #include "file/file.h"
+#include "file/gif/format.h"
 #include "modules/palette.h"
 #include "raster/raster.h"
 #include "util/autocrop.h"
 
-#include "gif/format.h"
 #include <stdio.h>
 #include <stdlib.h>