cleanups & avoid cd, it can lead to infinite loops; use make -C instead
This commit is contained in:
parent
e929db7543
commit
38355b5240
12
Makefile.in
12
Makefile.in
@ -537,13 +537,11 @@ INSTALLED_PACKAGES= \
|
|||||||
@PKG_PRISM@ \
|
@PKG_PRISM@ \
|
||||||
@PKG_PYTHON@ \
|
@PKG_PYTHON@ \
|
||||||
@PKG_RAPTOR@ \
|
@PKG_RAPTOR@ \
|
||||||
@PKG_CHR@ \
|
|
||||||
@PKG_CLIB@ \
|
@PKG_CLIB@ \
|
||||||
|
@PKG_CHR@ \
|
||||||
@PKG_JPL@ \
|
@PKG_JPL@ \
|
||||||
@PKG_LIBARCHIVE@ \
|
@PKG_LIBARCHIVE@ \
|
||||||
@PKG_LTX2HTM@ \
|
|
||||||
@PKG_ODBC@ \
|
@PKG_ODBC@ \
|
||||||
\
|
|
||||||
@PKG_PLUNIT@ \
|
@PKG_PLUNIT@ \
|
||||||
@PKG_REAL@ \
|
@PKG_REAL@ \
|
||||||
@PKG_RDF@ \
|
@PKG_RDF@ \
|
||||||
@ -551,7 +549,7 @@ INSTALLED_PACKAGES= \
|
|||||||
@PKG_SGML@ \
|
@PKG_SGML@ \
|
||||||
@PKG_SWIG@ \
|
@PKG_SWIG@ \
|
||||||
@PKG_WINCONSOLE@ \
|
@PKG_WINCONSOLE@ \
|
||||||
@PKG_ZLIB@ # @PKG_PLDOC@
|
@PKG_ZLIB@
|
||||||
|
|
||||||
PACKAGES= \
|
PACKAGES= \
|
||||||
library \
|
library \
|
||||||
@ -577,7 +575,7 @@ yap-win: yap-win@EXEC_SUFFIX@
|
|||||||
yapwin: yap-win@EXEC_SUFFIX@
|
yapwin: yap-win@EXEC_SUFFIX@
|
||||||
|
|
||||||
yap-win@EXEC_SUFFIX@: $(PLCONS_OBJECTS) $(HEADERS) @YAPLIB@
|
yap-win@EXEC_SUFFIX@: $(PLCONS_OBJECTS) $(HEADERS) @YAPLIB@
|
||||||
(cd swi/console; $(MAKE))
|
$(MAKE) -C swi/console
|
||||||
$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win@EXEC_SUFFIX@ $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) -lgdi32 @MPILDF@
|
$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win@EXEC_SUFFIX@ $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) -lgdi32 @MPILDF@
|
||||||
|
|
||||||
libYap.a: $(LIB_OBJECTS) yapi.o
|
libYap.a: $(LIB_OBJECTS) yapi.o
|
||||||
@ -684,7 +682,7 @@ depend: $(HEADERS) $(C_SOURCES)
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
clean: clean_docs clean_local
|
clean: clean_docs clean_local
|
||||||
for f in $(PACKAGES); do ( cd $$f ; $(MAKE) clean ); done
|
for f in $(PACKAGES); do ( $(MAKE) -C $$f clean ); done
|
||||||
|
|
||||||
clean_local:
|
clean_local:
|
||||||
rm -f *.o *~ *.BAK *.a
|
rm -f *.o *~ *.BAK *.a
|
||||||
@ -784,7 +782,7 @@ distclean_docs: clean_docs
|
|||||||
rm -f yap.ps yap.html yap_toc.html yap.pdf yap.info*
|
rm -f yap.ps yap.html yap_toc.html yap.pdf yap.info*
|
||||||
|
|
||||||
installcheck:
|
installcheck:
|
||||||
(cd packages/cplint; $(MAKE) installcheck)
|
$(MAKE) -C packages/cplint installcheck
|
||||||
|
|
||||||
|
|
||||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||||
|
Reference in New Issue
Block a user