try to clean-up makefiles and autoconfs

This commit is contained in:
Vítor Santos Costa
2014-10-26 17:39:52 +00:00
parent 9cd2975532
commit 2053c44054
18 changed files with 143 additions and 86 deletions

View File

@@ -55,16 +55,16 @@ cudd.o: $(srcdir)/cudd.c
$(CC) -c $(CFLAGS) $(srcdir)/cudd.c -o cudd.o
@DO_SECOND_LD@%.@SO@: %.o
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ @CUDD_LDFLAGS@
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@ @CUDD_LIBS@
@DO_SECOND_LD@cudd.@SO@: cudd.o
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o cudd.@SO@ cudd.o @EXTRA_LIBS_FOR_DLLS@ @CUDD_LDFLAGS@
@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o cudd.@SO@ cudd.o @EXTRA_LIBS_FOR_DLLS@ @CUDD_LIBS@
install: all install-examples
mkdir -p $(DESTDIR)$(SHAREDIR)
for h in $(BDD_PROLOG); do $(INSTALL_DATA) $$h $(DESTDIR)$(SHAREDIR); done
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
@WINDOWS@ $(INSTALL_PROGRAM) @CUDD_LDFLAGS@ $(DESTDIR)$(BINDIR)
@WINDOWS@ $(INSTALL_PROGRAM) @CUDD_LIBS@ $(DESTDIR)$(BINDIR)
install-examples:

View File

@@ -53,7 +53,7 @@ fi
if test "$target_os" = "mingw32" -o "$target_os" = "mingw64"
then
#mingw: we know where things are
CUDD_LDFLAGS="$cudd_dir/lib/all_cudd.dll"
CUDD_LIBS="$cudd_dir/lib/all_cudd.dll"
cudd_installed="yes"
else
@@ -90,7 +90,7 @@ AC_SEARCH_LIBS(Cudd_Init, [cudd], [cudd_installed="yes"], [cudd_installed="no"])
CPPFLAGS="$OLD_CPPFLAGS"
if test "$cudd_installed" = yes; then
CUDD_LDFLAGS="$LIBS"
CUDD_LIBS="$LIBS"
else
cat << EOF
##################################################################
@@ -106,7 +106,7 @@ fi
fi
AC_SUBST(PKG_BDDLIB)
AC_SUBST(CUDD_LDFLAGS)
AC_SUBST(CUDD_LIBS)
AC_SUBST(CUDD_CPPFLAGS)
mkdir -p packages/bdd