diff --git a/.gitattributes b/.gitattributes index 1f1c316a23108595692dc295826298d3242e0a3a..58fb9afa9738bb3698e452b8a5e67dc4a103bf3e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,7 +21,6 @@ include/zipr_optimizations.h -text include/zipr_stats.h -text include/zipr_utils.h -text /install-sh -text -src/Makefile.in -text src/SConscript -text src/SConstruct -text src/dollop.cpp -text diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index 2d04f7b094179c531e1c58c8dd111a283b14ba35..0000000000000000000000000000000000000000 --- a/src/Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ - -INC=-I../include -I../third_party/ELFIO/elfio-2.2 -I$(SECURITY_TRANSFORMS_HOME)/include -I$(SECURITY_TRANSFORMS_HOME)/libIRDB/include -I$(SECURITY_TRANSFORMS_HOME)/beaengine/include -I${SECURITY_TRANSFORMS_HOME}/tools/transforms/ - - - -SRCS=zipr.cpp zipr_options.cpp zipr_stats.cpp memory_space.cpp main.cpp plugin_man.cpp -OBJS=$(subst .cpp,.o, $(SRCS)) -EXE=zipr.exe - -CXX=@CXX@ -CXXFLAGS=@CXXFLAGS@ @OPTIMIZE@ -LDFLAGS=-L$(SECURITY_TRANSFORMS_HOME)/lib -IMPLIBS=@IMPLIBS@ -LIBS=${SECURITY_TRANSFORMS_HOME}/tools/transforms/Rewrite_Utility.o -ltransform -lIRDB-core -lBeaEngine_s_d -ldl -lpqxx -lpq - - - - -all: $(EXE) - --include $(OBJS:.o=.d) - -$(EXE): $(OBJS) - g++ $(LDFLAGS) $(OBJS) $(LIBS) $(IMPLIBS) -o $@ - -%.o: %.cpp - $(CXX) -c $(CXXFLAGS) $*.cpp - @# - @# build dependencies -- http://scottmcpeak.com/autodepend/autodepend.html - @# - $(CXX) -MM $(CXXFLAGS) $*.cpp > $*.d - @cp -f $*.d $*.d.tmp - @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d - @rm -f $*.d.tmp - - - - -clean: - rm -f $(OBJS) $(EXE) *.d *.o libzipr.a diff --git a/src/ehwrite.cpp b/src/ehwrite.cpp index b865a6d685ea0dd3eb6eaa30c13cbe69fcbb2be4..b994eadb9bcc2ca82b6ada769ba59b312c3c94fb 100644 --- a/src/ehwrite.cpp +++ b/src/ehwrite.cpp @@ -18,7 +18,7 @@ #include "elfio/elfio.hpp" #include "elfio/elfio_dump.hpp" #include "targ-config.h" -#include "beaengine/BeaEngine.h" +//#include "beaengine/BeaEngine.h" using namespace libIRDB; using namespace std; diff --git a/src/elfwrite.cpp b/src/elfwrite.cpp index 4b63029d882a6f2d99e6e3abe085497b77d20aee..d705eecd968c9dca8c5c80a0ad0341f27d7fee51 100644 --- a/src/elfwrite.cpp +++ b/src/elfwrite.cpp @@ -18,7 +18,7 @@ #include "elfio/elfio.hpp" #include "elfio/elfio_dump.hpp" #include "targ-config.h" -#include "beaengine/BeaEngine.h" +//#include "beaengine/BeaEngine.h" using namespace libIRDB; using namespace std;