small fixes
This commit is contained in:
parent
67609ed1ce
commit
5c261da4f6
@ -76,7 +76,7 @@ CPLINT_SEMANTICS_PROGRAMS= \
|
|||||||
$(CPLINT_SRCDIR)/semlpadsld.pl \
|
$(CPLINT_SRCDIR)/semlpadsld.pl \
|
||||||
$(CPLINT_SRCDIR)/semlpad.pl \
|
$(CPLINT_SRCDIR)/semlpad.pl \
|
||||||
$(CPLINT_SRCDIR)/semcpl.pl \
|
$(CPLINT_SRCDIR)/semcpl.pl \
|
||||||
$(CPLINT_SRCDIR)/slg.pl
|
$(CPLINT_SRCDIR)/slg.pl
|
||||||
|
|
||||||
CPLINT_TEST_PROGRAMS= \
|
CPLINT_TEST_PROGRAMS= \
|
||||||
$(CPLINT_SRCDIR)/testlpadvel.pl \
|
$(CPLINT_SRCDIR)/testlpadvel.pl \
|
||||||
@ -86,7 +86,7 @@ CPLINT_TEST_PROGRAMS= \
|
|||||||
$(CPLINT_SRCDIR)/testcpl.pl \
|
$(CPLINT_SRCDIR)/testcpl.pl \
|
||||||
$(CPLINT_SRCDIR)/testsemlpadsld.pl \
|
$(CPLINT_SRCDIR)/testsemlpadsld.pl \
|
||||||
$(CPLINT_SRCDIR)/testsemlpad.pl \
|
$(CPLINT_SRCDIR)/testsemlpad.pl \
|
||||||
$(CPLINT_SRCDIR)/testsemcpl.pl
|
$(CPLINT_SRCDIR)/testsemcpl.pl
|
||||||
|
|
||||||
CPLINT_EXAMPLES= \
|
CPLINT_EXAMPLES= \
|
||||||
$(CPLINT_EXDIR)/dice.cpl \
|
$(CPLINT_EXDIR)/dice.cpl \
|
||||||
@ -141,7 +141,7 @@ CPLINT_DOCS=\
|
|||||||
$(CPLINT_DOCDIR)/manual.html \
|
$(CPLINT_DOCDIR)/manual.html \
|
||||||
$(CPLINT_DOCDIR)/manual.css \
|
$(CPLINT_DOCDIR)/manual.css \
|
||||||
$(CPLINT_DOCDIR)/manual0x.png
|
$(CPLINT_DOCDIR)/manual0x.png
|
||||||
|
|
||||||
# $(CPLINT_DOCDIR)/Makefile
|
# $(CPLINT_DOCDIR)/Makefile
|
||||||
|
|
||||||
CPLINT_LEARNING_PROGRAMS=\
|
CPLINT_LEARNING_PROGRAMS=\
|
||||||
@ -154,10 +154,10 @@ CPLINT_LEARNING_PROGRAMS=\
|
|||||||
|
|
||||||
all: $(SOBJS)
|
all: $(SOBJS)
|
||||||
|
|
||||||
cplint_yap.o: $(srcdir)/cplint_yap.c $(srcdir)/cplint.h
|
cplint_yap.o: $(srcdir)/cplint_yap.c $(srcdir)/cplint.h
|
||||||
$(CC) -c $(CFLAGS) $(CPLINT_CFLAGS) $(srcdir)/cplint_yap.c -o cplint_yap.o
|
$(CC) -c $(CFLAGS) $(CPLINT_CFLAGS) $(srcdir)/cplint_yap.c -o cplint_yap.o
|
||||||
|
|
||||||
cplint_Prob.o: $(srcdir)/cplint_Prob.c $(srcdir)/cplint.h
|
cplint_Prob.o: $(srcdir)/cplint_Prob.c $(srcdir)/cplint.h
|
||||||
$(CC) -c $(CFLAGS) $(CPLINT_CFLAGS) $(srcdir)/cplint_Prob.c -o cplint_Prob.o
|
$(CC) -c $(CFLAGS) $(CPLINT_CFLAGS) $(srcdir)/cplint_Prob.c -o cplint_Prob.o
|
||||||
|
|
||||||
bddem.o : $(srcdir)/slipcase/bddem.c
|
bddem.o : $(srcdir)/slipcase/bddem.c
|
||||||
@ -165,15 +165,17 @@ bddem.o : $(srcdir)/slipcase/bddem.c
|
|||||||
|
|
||||||
|
|
||||||
@DO_SECOND_LD@cplint.@SO@: cplint_yap.o cplint_Prob.o
|
@DO_SECOND_LD@cplint.@SO@: cplint_yap.o cplint_Prob.o
|
||||||
@DO_SECOND_LD@ @CPLINT_SHLIB_LD@ -o cplint.@SO@ $(CPLINT_LDFLAGS) cplint_yap.o cplint_Prob.o $(CPLINT_LIBS) @EXTRA_LIBS_FOR_DLLS@
|
@DO_SECOND_LD@ @SHLIB_LD@ -o cplint.@SO@ $(CPLINT_LDFLAGS) cplint_yap.o cplint_Prob.o \
|
||||||
|
$(CPLINT_LIBS) @EXTRA_LIBS_FOR_DLLS@ @CUDD_LIBS@
|
||||||
|
|
||||||
@DO_SECOND_LD@bddem.@SO@: bddem.o
|
@DO_SECOND_LD@bddem.@SO@: bddem.o
|
||||||
@DO_SECOND_LD@ @CPLINT_SHLIB_LD@ -o bddem.@SO@ $(CPLINT_LDFLAGS) bddem.o $(CPLINT_LIBS) @EXTRA_LIBS_FOR_DLLS@
|
@DO_SECOND_LD@ @SHLIB_LD@ -o bddem.@SO@ $(CPLINT_LDFLAGS) bddem.o \
|
||||||
|
$(CPLINT_LIBS) @EXTRA_LIBS_FOR_DLLS@ @CUDD_LIBS@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
|
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
|
||||||
|
|
||||||
install: all
|
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
|
||||||
@ -192,13 +194,12 @@ install: all
|
|||||||
cp $(CPLINT_SRCDIR)/lemur/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
|
cp $(CPLINT_SRCDIR)/lemur/*.pl $(DESTDIR)$(SHAREDIR)/cplint/
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
# use the following target to run individual tests, e.g. make testlpad
|
# use the following target to run individual tests, e.g. make testlpad
|
||||||
test%:
|
test%:
|
||||||
echo "t. halt." | yap -l $(CPLINT_SRCDIR)/$@.pl
|
echo "t. halt." | yap -l $(CPLINT_SRCDIR)/$@.pl
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile
|
rm -f Makefile
|
||||||
|
|
||||||
|
@ -29,10 +29,10 @@ RANLIB=@RANLIB@
|
|||||||
SHLIB_SUFFIX=@SO@
|
SHLIB_SUFFIX=@SO@
|
||||||
CWD=$(PWD)
|
CWD=$(PWD)
|
||||||
srcdir=@srcdir@
|
srcdir=@srcdir@
|
||||||
CPLINT_CPPFLAGS=@CPPFLAGS@ @CPLINT_CPPFLAGS@ -I@abs_top_builddir@
|
CPLINT_CPPFLAGS=@CPPFLAGS@ @CPLINT_CPPFLAGS@ -I@abs_top_builddir@
|
||||||
CPLINT_LDFLAGS=@CPLINT_LDFLAGS@
|
CPLINT_LDFLAGS=@CPLINT_LDFLAGS@
|
||||||
CPLINT_LIBS=@CPLINT_LIBS@
|
CPLINT_LIBS=@CPLINT_LIBS@
|
||||||
CFLAGS=@CFLAGS@ $(YAP_EXTRAS) $(DEFS)
|
CFLAGS=@CFLAGS@ $(YAP_EXTRAS) $(DEFS)
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
||||||
@ -42,13 +42,13 @@ default: LPADBDD
|
|||||||
LPADBDD: ProblogBDD.o simplecudd.o general.o
|
LPADBDD: ProblogBDD.o simplecudd.o general.o
|
||||||
@echo Making ProblogBDD...
|
@echo Making ProblogBDD...
|
||||||
@echo Copyright T. Mantadelis, A. Kimmig, B. Gutmann and Katholieke Universiteit Leuven 2008
|
@echo Copyright T. Mantadelis, A. Kimmig, B. Gutmann and Katholieke Universiteit Leuven 2008
|
||||||
$(CC) $(CPLINT_LDFLAGS) ProblogBDD.o simplecudd.o general.o $(CPLINT_LIBS) -o LPADBDD
|
$(CC) $(CPLINT_LDFLAGS) ProblogBDD.o simplecudd.o general.o $(CPLINT_LIBS) @CUDD_LIBS@ -o LPADBDD
|
||||||
|
|
||||||
%.o : $(srcdir)/%.c
|
%.o : $(srcdir)/%.c
|
||||||
$(CC) $(CPLINT_CPPFLAGS) -c $<
|
$(CC) $(CPLINT_CPPFLAGS) -c $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o LPADBDD
|
rm -f *.o LPADBDD
|
||||||
|
|
||||||
install: default
|
install: default
|
||||||
$(INSTALL_PROGRAM) LPADBDD $(DESTDIR)
|
$(INSTALL_PROGRAM) LPADBDD $(DESTDIR)
|
||||||
|
Reference in New Issue
Block a user