From 6bbc96c97d3e7d1c6774e36968da841d39e53abe Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Tue, 6 Feb 2018 20:48:52 +0000
Subject: [PATCH] more bea->libIRDB-decode changes
---
.gitattributes | 1 -
src/Makefile.in | 40 ----------------------------------------
src/ehwrite.cpp | 2 +-
src/elfwrite.cpp | 2 +-
4 files changed, 2 insertions(+), 43 deletions(-)
delete mode 100644 src/Makefile.in
diff --git a/.gitattributes b/.gitattributes
index 1f1c316..58fb9af 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 2d04f7b..0000000
--- 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 b865a6d..b994ead 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 4b63029..d705eec 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;
--
GitLab