fixed compilation problems

This commit is contained in:
Fabrizio Riguzzi 2014-10-15 15:15:24 +02:00
parent 49ccb545f8
commit 1d98481ac3
3 changed files with 9 additions and 8 deletions

View File

@ -148,7 +148,9 @@ CPLINT_LEARNING_PROGRAMS=\
$(CPLINT_SRCDIR)/em \ $(CPLINT_SRCDIR)/em \
$(CPLINT_SRCDIR)/rib \ $(CPLINT_SRCDIR)/rib \
$(CPLINT_SRCDIR)/slipcase \ $(CPLINT_SRCDIR)/slipcase \
$(CPLINT_SRCDIR)/slipcover $(CPLINT_SRCDIR)/slipcover \
$(CPLINT_SRCDIR)/lemur
all: $(SOBJS) all: $(SOBJS)
@ -167,7 +169,7 @@ cplint_Prob.o: $(srcdir)/cplint_Prob.c $(srcdir)/cplint.h
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
install: all install-examples install: all
mkdir -p $(DESTDIR)$(SHAREDIR)/cplint mkdir -p $(DESTDIR)$(SHAREDIR)/cplint
mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/examples mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/examples
mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/doc mkdir -p $(DESTDIR)$(SHAREDIR)/cplint/doc
@ -183,9 +185,8 @@ install: all install-examples
cp $(CPLINT_SRCDIR)/rib/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ cp $(CPLINT_SRCDIR)/rib/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
cp $(CPLINT_SRCDIR)/slipcase/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ cp $(CPLINT_SRCDIR)/slipcase/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
cp $(CPLINT_SRCDIR)/slipcover/*.pl $(DESTDIR)$(SHAREDIR)/cplint/ cp $(CPLINT_SRCDIR)/slipcover/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
$(INSTALL_PROGRAM) slipcase/bddem.so $(DESTDIR)$(YAPLIBDIR) cp $(CPLINT_SRCDIR)/lemur/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
install_examples:
installcheck: installcheck:
for h in ${CPLINT_TEST_PROGRAMS}; do echo "t. halt." | $(BINDIR)/yap -l $$h; done for h in ${CPLINT_TEST_PROGRAMS}; do echo "t. halt." | $(BINDIR)/yap -l $$h; done

View File

@ -27,7 +27,7 @@ if test ! "$yap_cv_cplint" = "no"
CPLINT_SHLIB_LD=$SHLIB_LD CPLINT_SHLIB_LD=$SHLIB_LD
SHLIB_SUFFIX="so" SHLIB_SUFFIX="so"
fi fi
PKG_CPLINT="packages/cplint packages/cplint/splipcase packages/cplint/approx/simplecuddLPADs" PKG_CPLINT="packages/cplint packages/cplint/slipcase packages/cplint/approx/simplecuddLPADs"
AC_SUBST(CPLINT_LIBS) AC_SUBST(CPLINT_LIBS)
AC_SUBST(CPLINT_CFLAGS) AC_SUBST(CPLINT_CFLAGS)
AC_SUBST(CPLINT_LDFLAGS) AC_SUBST(CPLINT_LDFLAGS)

View File

@ -13,7 +13,7 @@ BINDIR = $(EROOTDIR)/bin
# where YAP should look for libraries # where YAP should look for libraries
# #
LIBDIR=@libdir@/Yap LIBDIR=@libdir@/Yap
DESTDIR=$(prefix)/share/Yap DESTDIR=$(prefix)/lib/Yap
# #
# #
CC=@CC@ CC=@CC@