Blob Blame History Raw
--- Makefile.orig	2016-09-05 14:54:44.000000000 -0600
+++ Makefile	2016-09-10 02:02:01.380988862 -0600
@@ -18,7 +18,7 @@
 	src/map/mapper src/map/mio src/map/super src/map/if \
 	src/map/amap src/map/cov src/map/scl src/map/mpm \
 	src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
-	src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
+	src/misc/vec src/misc/hash src/misc/tim \
 	src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
 	src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
 	src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
@@ -117,7 +117,7 @@
 endif
 
 # LIBS := -ldl -lrt
-LIBS += -ldl -lm
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl -lm
 ifneq ($(findstring Darwin, $(shell uname)), Darwin)
    LIBS += -lrt
 endif
--- src/base/io/ioReadAiger.c.orig	2016-02-03 14:56:47.000000000 -0700
+++ src/base/io/ioReadAiger.c	2016-02-04 21:37:07.724515263 -0700
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
 #include "ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
--- src/base/io/ioReadBlifMv.c.orig	2016-02-03 14:56:47.000000000 -0700
+++ src/base/io/ioReadBlifMv.c	2016-02-04 21:37:07.726515102 -0700
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
 
-#include "misc/zlib/zlib.h"
-#include "misc/bzlib/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
 #include "base/abc/abc.h"
 #include "misc/vec/vecPtr.h"
 #include "ioAbc.h"
--- src/base/io/ioWriteAiger.c.orig	2016-02-03 14:56:47.000000000 -0700
+++ src/base/io/ioWriteAiger.c	2016-02-04 21:37:07.727515021 -0700
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "misc/bzlib/bzlib.h"
-#include "misc/zlib/zlib.h"
+#include <bzlib.h>
+#include <zlib.h>
 #include "ioAbc.h"
 
 
--- src/sat/cnf/cnfMan.c.orig	2016-02-03 14:56:47.000000000 -0700
+++ src/sat/cnf/cnfMan.c	2016-02-04 21:37:07.728514940 -0700
@@ -21,7 +21,7 @@
 #include "cnf.h"
 #include "sat/bsat/satSolver.h"
 #include "sat/bsat/satSolver2.h"
-#include "misc/zlib/zlib.h"
+#include <zlib.h>
 
 ABC_NAMESPACE_IMPL_START