From 490f037259b533ac1e416e420c8cb65cceee4397 Mon Sep 17 00:00:00 2001 From: gereon Date: Mon, 25 Feb 2013 14:48:52 +0100 Subject: [PATCH] Kind of undoing the previous commit. gcc can only link, if -lobj is the first cudd lib to be linked... Now, all the object files can be removed from libobj.a --- CMakeLists.txt | 2 +- resources/3rdparty/cudd-2.5.0/obj/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92b6b03e2..bed5cc152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,7 @@ if (LOG4CPLUS_INCLUDE_DIR) endif(LOG4CPLUS_INCLUDE_DIR) if (CUDD_LIBRARY_DIRS) - target_link_libraries(storm "-lcudd -lmtr -lst -lutil -lepd -lobj") + target_link_libraries(storm "-lobj -lcudd -lmtr -lst -lutil -lepd") endif(CUDD_LIBRARY_DIRS) if (THREADS_FOUND) diff --git a/resources/3rdparty/cudd-2.5.0/obj/Makefile b/resources/3rdparty/cudd-2.5.0/obj/Makefile index 54d0c92ce..ffc656452 100644 --- a/resources/3rdparty/cudd-2.5.0/obj/Makefile +++ b/resources/3rdparty/cudd-2.5.0/obj/Makefile @@ -62,7 +62,7 @@ UBJ = $(SRC:.cc=.u) #------------------------------------------------------ lib$(P).a: $(POBJ) - ar rv $@ $? ../cudd/*.o ../dddmp/*.o ../epd/*.o ../mtr/*.o ../st/*.o ../util/*.o + ar rv $@ $? $(RANLIB) $@ .cc.o: $(PHDR)