diff --git a/.gitattributes b/.gitattributes index 63270b69bcf9f232e3af412baf2220fd807214dc..c76b64693e520e2e0590eb16befe5ff9c54e9824 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,4 @@ * text=auto !eol -/Makefile.in -text /SConscript -text /SConstruct -text /configure.in -text diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 4a030ca70bcdcdd838d54e6ab09ab718be4ae0d6..0000000000000000000000000000000000000000 --- a/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ - - - -SRCS=push64_relocs.cpp -OBJS=$(subst .cpp,.o, $(SRCS)) -EXE=push64_relocs.zpi - -CXX=@CXX@ -CXXFLAGS=@CXXFLAGS@ @OPTIMIZE@ -LDFLAGS=@LDFLAGS@ -LIBS= -#${SECURITY_TRANSFORMS_HOME}/tools/transforms/Rewrite_Utility.o -#-lpqxx -lpq -lIRDB-core -lBeaEngine_s_d -ltransform - -all: $(EXE) - --include $(OBJS:.o=.d) - -$(EXE): $(OBJS) - $(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -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 - -install: - cp $(EXE) ${ZIPR_INSTALL}/plugins - - -clean: - rm -f $(OBJS) $(EXE) *.d *.o diff --git a/SConscript b/SConscript index 8599f7a168b339371e1a65e402cc76239332983d..9b53082626711d7050a136d78736418678226213 100644 --- a/SConscript +++ b/SConscript @@ -28,7 +28,7 @@ if 'do_cgc' in env and int(env['do_cgc']) == 1: files= ''' - push64_relocs.cpp + unpin.cpp ''' # ELFIO needs to be first so we get the zipr version instead of the sectrans version. the zipr version is modified to include get_offset. @@ -56,7 +56,7 @@ if sysname != "SunOS": myenv.Append(CXXFLAGS=" -std=c++11 ") myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpath), SHLIBSUFFIX=".zpi", SHLIBPREFIX="") -lib=myenv.SharedLibrary("push64_relocs", Split(files)) +lib=myenv.SharedLibrary("unpin", Split(files)) install=myenv.Install("$ZIPR_INSTALL/plugins/", lib) Default(install)