jwboyer / rpms / abc

Forked from rpms/abc 3 years ago
Clone
Blob Blame History Raw
--- ./Makefile.orig	2014-11-30 17:18:13.000000000 -0700
+++ ./Makefile	2014-12-01 12:00:00.000000000 -0700
@@ -20,7 +20,7 @@ MODULES := \
 	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/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
 	src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
@@ -67,7 +67,7 @@ endif
 endif
 
 # LIBS := -ldl -lrt
-LIBS += -ldl
+LIBS += -Wl,--as-needed -lbz2 -lz -ldl
 ifneq ($(findstring Darwin, $(shell uname)), Darwin)
    LIBS += -lrt
 endif
@@ -104,15 +104,15 @@ DEP := $(OBJ:.o=.d)
 
 %.o: %.c
 	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
-	@$(CC) -c $(CFLAGS) $< -o $@
+	$(CC) -c $(CFLAGS) $< -o $@
 
 %.o: %.cc
 	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
-	@$(CXX) -c $(CXXFLAGS) $< -o $@
+	$(CXX) -c $(CXXFLAGS) $< -o $@
 
 %.o: %.cpp
 	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
-	@$(CXX) -c $(CXXFLAGS) $< -o $@
+	$(CXX) -c $(CXXFLAGS) $< -o $@
 
 %.d: %.c
 	@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
--- ./src/base/io/ioReadAiger.c.orig	2014-11-30 17:18:13.000000000 -0700
+++ ./src/base/io/ioReadAiger.c	2014-12-01 12:00:00.000000000 -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	2014-11-30 17:18:13.000000000 -0700
+++ ./src/base/io/ioReadBlifMv.c	2014-12-01 12:00:00.000000000 -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	2014-11-30 17:18:13.000000000 -0700
+++ ./src/base/io/ioWriteAiger.c	2014-12-01 12:00:00.000000000 -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	2014-11-30 17:18:13.000000000 -0700
+++ ./src/sat/cnf/cnfMan.c	2014-12-01 12:00:00.000000000 -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