Engine and VFS API cleanupv0.6.72

Also enable symlink resolving by default.

1 files changed, 15 insertions, 19 deletions

diff --git a/libarchive/Makefile b/libarchive/Makefile
index 595cd5f..26b4502 100644
--- a/libarchive/Makefile
+++ b/libarchive/Makefile
@@ -1,30 +1,26 @@
 # path definitions
 DESTDIR = /usr
-INSTALL=install -c
+INSTALL = install -c
 INSTALL_DATA = ${INSTALL} -m 644
-DIR_COMMON=../common/
-DIR_LIBARCHIVE=./libarchive-2.7.1
+DIR_LIBARCHIVE = ./libarchive-2.7.1
 
 # compiler options
 CC = gcc
-CPP = g++
-CFLAGS =-I. -I/usr/include -I$(DIR_COMMON) \
-	-Wall -fPIC -O2 -g \
-	-DG_DISABLE_DEPRECATED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE \
-	-D__VERBOSE_DEBUGx
+CFLAGS = -I. -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_OBJECTS = libarchive.o
 
-VFS_OBJECTS=libarchive.o
 
-
-.SUFFIXES: .c .cpp
+.SUFFIXES: .c
 .c.o:
 	$(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
-.cpp.o:
-	$(CPP) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c $<
 
 
 all: static
@@ -48,10 +44,10 @@ lib_libarchive_compile:
 	fi;
 
 
-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::
 	$(INSTALL) ./libarchive_plugin.so $(DESTDIR)/lib$(LIB_SUFFIX)/tuxcmd/