Engine and VFS API cleanupv0.6.72

Also enable symlink resolving by default.

1 files changed, 14 insertions, 14 deletions

diff --git a/zip/Makefile b/zip/Makefile
index 15e4f11..59a2534 100644
--- a/zip/Makefile
+++ b/zip/Makefile
@@ -1,29 +1,29 @@
 # path definitions
 DESTDIR = /usr
-INSTALL=install -c
+INSTALL = install -c
 INSTALL_DATA = ${INSTALL} -m 644
 DIR_ZIPARCHIVE = ./ZipArchive/
 
 # compiler options
 CC = gcc
 CPP = g++
-CFLAGS =-I. -I$(DIR_ZIPARCHIVE) -I/usr/include \
-	-Wall -fPIC -O2 -g \
-	-DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
-	-D__VERBOSE_DEBUGx
+CFLAGS = -I. -I$(DIR_ZIPARCHIVE) -I/usr/include \
+	 -Wall -fPIC -O2 -g \
+	 -DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
+	 -D__VERBOSE_DEBUGx
 
-LIB_SUFFIX=`if test \`uname -m\` = x86_64 -o \`uname -m\` = ppc64; then echo 64; fi`
+LIB_SUFFIX = `if test \`uname -m\` = x86_64 -o \`uname -m\` = ppc64; then echo 64; fi`
 
 
-VFS_COMMON_OBJECTS=strutils.o treepathutils.o treepath_vfs.o vfsutils.o
+VFS_COMMON_OBJECTS = filelist.o filelist-vfs-intf.o strutils.o vfsutils.o
 
-VFS_C_OBJECTS=
-VFS_CPP_OBJECTS=zip.o
+VFS_C_OBJECTS =
+VFS_CPP_OBJECTS = zip.o
 
 
 .SUFFIXES: .c .cpp
 .c.o:
-	$(CPP) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
+	$(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
 .cpp.o:
 	$(CPP) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
 
@@ -36,10 +36,10 @@ libzip_plugin.so: ziparchive $(VFS_COMMON_OBJECTS) $(VFS_CPP_OBJECTS) $(VFS_C_OB
 ziparchive:
 	( cd $(DIR_ZIPARCHIVE) && make -f ../Makefile.ziparch ) || exit 1
 
-strutils.o: strutils.c strutils.h
-treepathutils.o: treepathutils.c treepathutils.h
-vfsutils.o: vfsutils.c vfsutils.h
-treepath_vfs.o: treepath_vfs.c treepath_vfs.h
+filelist.o: filelist.h filelist.c
+filelist-vfs-intf.o: filelist-vfs-intf.h filelist-vfs-intf.c
+strutils.o: strutils.h strutils.c
+vfsutils.o: vfsutils.h vfsutils.c
 
 
 install::