clean up makefile

This commit is contained in:
Vitor Santos Costa 2014-02-10 23:30:21 +00:00
parent 231290bad3
commit 00f0d449ec
11 changed files with 48 additions and 60 deletions

View File

@ -80,6 +80,8 @@ PROBLOG_EXAMPLES = \
MANUAL_NAME = problog MANUAL_NAME = problog
MANUAL = $(srcdir)/$(MANUAL_NAME) MANUAL = $(srcdir)/$(MANUAL_NAME)
all:
install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES) install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/problog
@ -88,6 +90,8 @@ install: $(PROGRAMS) $(PROBLOG_PROGRAMS) $(PROBLOG_EXAMPLES)
for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
for p in $(PROBLOG_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog; done for p in $(PROBLOG_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap/problog; done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(DOCSDIR) $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(DOCSDIR)
install-examples:
for p in $(PROBLOG_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(EXDOCSDIR); done for p in $(PROBLOG_EXAMPLES); do $(INSTALL_DATA) $$p $(DESTDIR)$(EXDOCSDIR); done
pdf: $(MANUAL) pdf: $(MANUAL)
@ -97,3 +101,8 @@ pdf: $(MANUAL)
install_docs: pdf install_docs: pdf
$(INSTALL_DATA) problog.pdf $(DESTDIR)$(DOCSDIR) $(INSTALL_DATA) problog.pdf $(DESTDIR)$(DOCSDIR)
clean:
realclean:
rm -f Makefile

@ -1 +1 @@
Subproject commit b83d419ba547a284a62ce951784849dc7b5ec712 Subproject commit ab6b1a70db5dfaf6467b7d4ab51cfa76f1352d4c

View File

@ -69,6 +69,9 @@ gecode.yap: $(srcdir)/gecode$(GECODE_MAJOR)_yap_hand_written.yap $(srcdir)/$(GEC
clean: clean:
-rm -f *.o *.so *~ gecode.yap -rm -f *.o *.so *~ gecode.yap
realclean:
-rm -f $(SOBJS) Makefile
install: all install: all
mkdir -p $(DESTDIR)$(YAPLIBDIR) mkdir -p $(DESTDIR)$(YAPLIBDIR)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
@ -76,3 +79,5 @@ install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
$(INSTALL) gecode.yap $(DESTDIR)$(SHAREDIR)/Yap $(INSTALL) gecode.yap $(DESTDIR)$(SHAREDIR)/Yap
$(INSTALL) $(srcdir)/clpfd.yap $(DESTDIR)$(SHAREDIR)/Yap/gecode $(INSTALL) $(srcdir)/clpfd.yap $(DESTDIR)$(SHAREDIR)/Yap/gecode
install-examples:

View File

@ -20,11 +20,11 @@ AC_ARG_ENABLE(gecode,
fi], use_gecode=$have_gecode) fi], use_gecode=$have_gecode)
if test "$use_gecode" = no; then if test "$use_gecode" = no; then
ENABLE_GECODE="@# " PKG_GECODE=""
else else
ENABLE_GECODE="" PKG_GECODE="packages/gecode"
fi fi
AC_SUBST(ENABLE_GECODE) AC_SUBST(PKG_GECODE)
AC_MSG_CHECKING([if dynamic arrays are supported]) AC_MSG_CHECKING([if dynamic arrays are supported])
@ -90,3 +90,8 @@ fi
AC_SUBST(GECODE_VERSION) AC_SUBST(GECODE_VERSION)
AC_SUBST(GECODE_EXTRALIBS) AC_SUBST(GECODE_EXTRALIBS)
if test "$PKG_GECODE" = "packages/gecode"; then
AC_CONFIG_FILES([packages/gecode/Makefile])
fi

View File

@ -1,5 +0,0 @@
all:
python code-generator.py
clean:
-rm -f *~ *.pyc

View File

@ -1,36 +0,0 @@
GECODEDIR := $(shell g++ $(CPPFLAGS) $(CXXFLAGS) -H -E gecodedir.hh 2>&1 >/dev/null | grep gecode/kernel.hh | awk '{print $$2}' | sed 's|/kernel.hh||')
GECODECONFIG := $(GECODEDIR)/support/config.hpp
GECODEVERSION := $(shell cat $(GECODECONFIG) | egrep '\<GECODE_VERSION\>' | awk '{print $$3}' | sed 's/"//g')
PROTOTYPES = ../gecode-prototypes-$(GECODEVERSION).hh
ENUMS = ../gecode-enums-$(GECODEVERSION).py
all: $(PROTOTYPES) $(ENUMS)
$(PROTOTYPES): % : xml/namespaceGecode.xml extract-prototypes.xsl
cat notice.hh > $@ || { rm -f $@; exit 1; }
xsltproc extract-prototypes.xsl $< \
| grep EXPORT \
| grep -v Symmetry \
| sed 's/Gecode:://g' \
| sed 's/< /</g' \
| sed 's/ >/>/g' \
| sed 's/ \&/\&/g' \
| sed 's/, /,/g' \
| sed 's/forceinline //g' \
| sed 's/GECODE_INT_EXPORT //g' \
| sed 's/GECODE_FLOAT_EXPORT //g' \
| sed 's/GECODE_SET_EXPORT //g' \
| grep -v '*' | sort >> $@ || { rm -f $@; exit 1; }
$(ENUMS): % : xml/namespaceGecode.xml extract-enums.xsl
cat notice.py > $@ || { rm -f $@; exit 1; }
xsltproc extract-enums.xsl $< >> $@ || { rm -f $@; exit 1; }
xml/namespaceGecode.xml: Doxyfile
doxygen Doxyfile
Doxyfile: Doxyfile.in
cat $< | sed "s#@GECODEDIR@#$(GECODEDIR)#" > $@ || { rm -f $@; exit 1; }
clean:
-rm -rf *~ gecode-prototypes-*.hh gecode-enums-*.py Doxyfile xml

View File

@ -31,7 +31,7 @@ AC_ARG_ENABLE(myddas-top-level,
if test "$yap_cv_myddas" != "no" if test "$yap_cv_myddas" != "no"
then then
ENABLE_MYDDAS="" PKG_MYDDAS="packages/myddas"
dnl check for mysql dnl check for mysql
AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes"], [yap_cv_mysql="no"]) AC_SEARCH_LIBS(mysql_init, [mysqlclient], [yap_cv_mysql="yes"], [yap_cv_mysql="no"])
if test "$yap_cv_mysql" = yes if test "$yap_cv_mysql" = yes
@ -58,6 +58,7 @@ then
ODBC_LIBS="$ODBC_LIBS -liodbc" ODBC_LIBS="$ODBC_LIBS -liodbc"
fi fi
fi fi
AC_CHECK_HEADERS(mysql/mysql.h)
if test "$yap_cv_odbc" = yes if test "$yap_cv_odbc" = yes
then then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC" YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_ODBC"
@ -73,13 +74,9 @@ then
YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL" YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_TOP_LEVEL"
fi fi
else else
ENABLE_MYDDAS="#@ " ENABLE_MYDDAS=""
fi fi
AC_SUBST(ENABLE_MYDDAS) AC_SUBST(PKG_MYDDAS)
if test "$yap_cv_myddas" != "no"
then
AC_CHECK_HEADERS(mysql/mysql.h)
fi

View File

@ -11,10 +11,10 @@ AC_ARG_WITH(python,
if test "$yap_cv_python" = "no"; then if test "$yap_cv_python" = "no"; then
PYTHON_TARGET="dummy" PYTHON_TARGET="dummy"
ENABLE_PYTHON="@# " PKG_PYTHON=""
elif test -e "$srcdir"/packages/python/Makefile.in ; then elif test -e "$srcdir"/packages/python/Makefile.in ; then
PYTHON_TARGET="pitf" PYTHON_TARGET="pitf"
ENABLE_PYTHON="" PKG_PYTHON="packages/python"
if test "$yap_cv_python" = "yes" if test "$yap_cv_python" = "yes"
then then
AC_CHECK_PROGS(PYTHON, python, "none") AC_CHECK_PROGS(PYTHON, python, "none")
@ -39,7 +39,7 @@ elif test -e "$srcdir"/packages/python/Makefile.in ; then
PYTHON_LIBS="-L $PYTHONHOME/lib" PYTHON_LIBS="-L $PYTHONHOME/lib"
else else
echo "Could not find libraries for Python" echo "Could not find libraries for Python"
ENABLE_PYTHON="@# " PKG_PYTHON=""
fi fi
OLIBS=$LIBS OLIBS=$LIBS
LIBS=$PYTHON_LIBS LIBS=$PYTHON_LIBS
@ -55,20 +55,20 @@ elif test -e "$srcdir"/packages/python/Makefile.in ; then
PYTHON_INCLUDES="-I $PYTHONHOME/include" PYTHON_INCLUDES="-I $PYTHONHOME/include"
else else
echo "Could not find includes for Python" echo "Could not find includes for Python"
ENABLE_PYTHON="@# " PKG_PYTHON=""
fi fi
fi fi
else else
PYTHON_TARGET="dummy" PYTHON_TARGET="dummy"
ENABLE_PYTHON="@# " PKG_PYTHON=""
fi fi
AC_SUBST(PYTHON_TARGET) AC_SUBST(PYTHON_TARGET)
AC_SUBST(ENABLE_PYTHON) AC_SUBST(PKG_PYTHON)
AC_SUBST(PYTHON_INCLUDES) AC_SUBST(PYTHON_INCLUDES)
AC_SUBST(PYTHON_LIBS) AC_SUBST(PYTHON_LIBS)
if test "$ENABLE_PYTHON" = ""; then if test "$PKG_PYTHON" != ""; then
AC_CONFIG_FILES([ packages/python/Makefile ]) AC_CONFIG_FILES([ packages/python/Makefile ])
fi fi

@ -1 +1 @@
Subproject commit 970bd759158b8ea164c0a178c66d624609a419ee Subproject commit 651702fe47088a12922e5051e6de89414a24e84c

View File

@ -76,9 +76,14 @@ pl-minisat.o : $(srcdir)/pl-minisat.C
install: all install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR) $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
install-examples:
clean: clean:
rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK rm -f *.o *~ $(OBJS) $(SOBJS) *.BAK
realclean:
rm -f Makefile $(OBJS)
depend: $(HEADERS) $(C_SOURCES) depend: $(HEADERS) $(C_SOURCES)
-@if test "$(GCC)" = yes; then\ -@if test "$(GCC)" = yes; then\

View File

@ -34,10 +34,18 @@ EXAMPLE_PROGRAMS= \
$(srcdir)/examples/adder.pl \ $(srcdir)/examples/adder.pl \
$(srcdir)/examples/pearl_examples.pl $(srcdir)/examples/pearl_examples.pl
all:
install: $(PROGRAMS) install: $(PROGRAMS)
mkdir -p $(DESTDIR)$(SHAREDIR)/Yap mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
mkdir -p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat mkdir -p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat
for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done for p in $(PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/Yap; done
for p in $(EXAMPLE_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat; done for p in $(EXAMPLE_PROGRAMS); do $(INSTALL_DATA) $$p $(DESTDIR)$(SHAREDIR)/doc/Yap/packages/examples/minisat; done
install-examples:
clean: clean:
realclean:
rm Makefile