You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
103 lines
3.1 KiB
103 lines
3.1 KiB
diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile
|
|
--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-06-04 21:06:49.000000000 +0200
|
|
+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2009-12-08 13:21:22.713559220 +0100
|
|
@@ -150,14 +150,6 @@ NSIS_OBJS = \
|
|
NsisIn.o \
|
|
NsisRegister.o \
|
|
|
|
-RAR_OBJS = \
|
|
- RarHandler.o \
|
|
- RarHeader.o \
|
|
- RarIn.o \
|
|
- RarItem.o \
|
|
- RarVolumeInStream.o \
|
|
- RarRegister.o \
|
|
-
|
|
TAR_OBJS = \
|
|
TarHandler.o \
|
|
TarHandlerOut.o \
|
|
@@ -233,13 +225,6 @@ COMPRESS_OBJS = \
|
|
ZlibDecoder.o \
|
|
ZDecoder.o \
|
|
|
|
-COMPRESS_OBJS_NON_FREE = \
|
|
- Rar1Decoder.o \
|
|
- Rar2Decoder.o \
|
|
- Rar3Decoder.o \
|
|
- Rar3Vm.o \
|
|
- RarCodecsRegister.o \
|
|
-
|
|
CRYPTO_OBJS = \
|
|
7zAes.o \
|
|
7zAesRegister.o \
|
|
@@ -247,8 +232,6 @@ CRYPTO_OBJS = \
|
|
MyAes.o \
|
|
Pbkdf2HmacSha1.o \
|
|
RandGen.o \
|
|
- Rar20Crypto.o \
|
|
- RarAes.o \
|
|
Sha1.o \
|
|
WzAes.o \
|
|
ZipCrypto.o \
|
|
@@ -298,7 +281,6 @@ OBJS = \
|
|
$(HFS_OBJS) \
|
|
$(ISO_OBJS) \
|
|
$(NSIS_OBJS) \
|
|
- $(RAR_OBJS) \
|
|
$(TAR_OBJS) \
|
|
$(UDF_OBJS) \
|
|
$(WIM_OBJS) \
|
|
diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list
|
|
--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-06-04 21:01:21.000000000 +0200
|
|
+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-12-08 13:21:52.858319619 +0100
|
|
@@ -124,13 +124,6 @@ SRCS=\
|
|
../../Archive/Nsis/NsisIn.cpp \
|
|
../../Archive/Nsis/NsisRegister.cpp \
|
|
\
|
|
- ../../Archive/Rar/RarHandler.cpp \
|
|
- ../../Archive/Rar/RarHeader.cpp \
|
|
- ../../Archive/Rar/RarIn.cpp \
|
|
- ../../Archive/Rar/RarItem.cpp \
|
|
- ../../Archive/Rar/RarVolumeInStream.cpp \
|
|
- ../../Archive/Rar/RarRegister.cpp \
|
|
- \
|
|
../../Archive/Tar/TarHandler.cpp \
|
|
../../Archive/Tar/TarHandlerOut.cpp \
|
|
../../Archive/Tar/TarHeader.cpp \
|
|
@@ -212,8 +205,6 @@ SRCS=\
|
|
../../Crypto/RandGen.cpp \
|
|
../../Crypto/Sha1.cpp \
|
|
../../Crypto/WzAes.cpp \
|
|
- ../../Crypto/Rar20Crypto.cpp \
|
|
- ../../Crypto/RarAes.cpp \
|
|
../../Crypto/ZipCrypto.cpp \
|
|
../../Crypto/ZipStrong.cpp
|
|
|
|
diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile
|
|
--- p7zip_9.04.orig/makefile 2009-06-04 20:28:50.000000000 +0200
|
|
+++ p7zip_9.04/makefile 2009-12-08 13:22:30.120194667 +0100
|
|
@@ -41,7 +41,6 @@ depend:
|
|
cd CPP/7zip/UI/Client7z ; $(MAKE) depend
|
|
cd CPP/7zip/UI/Console ; $(MAKE) depend
|
|
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
|
|
- cd CPP/7zip/Compress/Rar ; $(MAKE) depend
|
|
cd CPP/7zip/UI/GUI ; $(MAKE) depend
|
|
|
|
sfx: common
|
|
@@ -51,7 +50,6 @@ sfx: common
|
|
common7z:common
|
|
$(MKDIR) bin/Codecs
|
|
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
|
|
- cd CPP/7zip/Compress/Rar ; $(MAKE) all
|
|
|
|
7z: common7z
|
|
cd CPP/7zip/UI/Console ; $(MAKE) all
|
|
@@ -71,7 +69,6 @@ clean:
|
|
cd CPP/7zip/UI/FileManager ; $(MAKE) clean
|
|
cd CPP/7zip/UI/GUI ; $(MAKE) clean
|
|
cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
|
|
- cd CPP/7zip/Compress/Rar ; $(MAKE) clean
|
|
cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean
|
|
cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean
|
|
cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean
|