Skip to content
Snippets Groups Projects
Commit bf9fbc05 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

- add PNG check in Get_BuildOptions()
- move "make doc" to top-level Makefile
- better "make purge"
parent 1d952524
No related branches found
No related tags found
No related merge requests found
// $Id: CommandLine.cpp,v 1.18 2003-04-19 22:11:42 geuzaine Exp $ // $Id: CommandLine.cpp,v 1.19 2003-06-13 16:53:07 geuzaine Exp $
// //
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
// //
...@@ -122,13 +122,16 @@ char *Get_BuildOptions(void) ...@@ -122,13 +122,16 @@ char *Get_BuildOptions(void)
if(first){ if(first){
#if defined(HAVE_GSL) #if defined(HAVE_GSL)
strcat(opt, "HAVE_GSL "); strcat(opt, "GSL ");
#endif #endif
#if defined(HAVE_TRIANGLE) #if defined(HAVE_TRIANGLE)
strcat(opt, "HAVE_TRIANGLE "); strcat(opt, "TRIANGLE ");
#endif #endif
#if defined(HAVE_LIBJPEG) #if defined(HAVE_LIBJPEG)
strcat(opt, "HAVE_LIBJPEG "); strcat(opt, "JPEG ");
#endif
#if defined(HAVE_LIBPNG)
strcat(opt, "PNG ");
#endif #endif
first = 0; first = 0;
} }
......
# $Id: Makefile,v 1.290 2003-06-01 00:12:53 geuzaine Exp $ # $Id: Makefile,v 1.291 2003-06-13 16:53:07 geuzaine Exp $
# #
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
# #
...@@ -82,17 +82,19 @@ parser: ...@@ -82,17 +82,19 @@ parser:
converters: converters:
cd utils/converters/autocad && ${MAKE} cd utils/converters/autocad && ${MAKE}
.PHONY: doc
doc:
cd doc/texinfo && ${MAKE} all
cd doc && tar zcvf ../gmsh-${GMSH_RELEASE}-doc.tgz\
FAQ CONTRIBUTORS VERSIONS README.win32 gmsh.1\
texinfo/gmsh.ps texinfo/gmsh.pdf texinfo/gmsh.txt\
texinfo/*.html texinfo/gmsh-info.tgz
doc-info: doc-info:
cd doc/texinfo && ${MAKE} info cd doc/texinfo && ${MAKE} info
doc-ps:
cd doc/texinfo && ${MAKE} ps
doc-pdf:
cd doc/texinfo && ${MAKE} pdf
purge: purge:
for i in . bin lib utils archives demos tutorial doc ${GMSH_DIRS}; \ for i in . bin lib utils archives demos tutorial doc doc/texinfo ${GMSH_DIRS}; \
do (cd $$i && rm -f *~ *~~ .gmsh-tmp .gmsh-errors gmon.out); \ do (cd $$i && rm -f *~ *~~ .gmsh-tmp .gmsh-errors gmon.out); \
done done
......
# $Id: Makefile,v 1.5 2003-03-21 00:52:46 geuzaine Exp $ # $Id: Makefile,v 1.6 2003-06-13 16:53:07 geuzaine Exp $
# #
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
# #
...@@ -19,6 +19,6 @@ ...@@ -19,6 +19,6 @@
# #
# Please report all bugs and problems to "gmsh@geuz.org". # Please report all bugs and problems to "gmsh@geuz.org".
purge: clean:
rm -f *~ rm -f *~
# $Id: Makefile,v 1.10 2003-04-15 21:49:43 geuzaine Exp $ # $Id: Makefile,v 1.11 2003-06-13 16:53:07 geuzaine Exp $
# #
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
# #
...@@ -19,14 +19,6 @@ ...@@ -19,14 +19,6 @@
# #
# Please report all bugs and problems to "gmsh@geuz.org". # Please report all bugs and problems to "gmsh@geuz.org".
all:
cd texinfo && ${MAKE} all
gtar zcvf gmsh-doc.tgz\
FAQ CONTRIBUTORS VERSIONS README.win32 \
texinfo/gmsh.ps texinfo/gmsh.pdf texinfo/gmsh.txt\
texinfo/*.html \
texinfo/gmsh-info.tgz gmsh.1
clean: clean:
rm -f *~ .*~ gmsh.ps gmsh.pdf gmsh.info* rm -f *~ .*~
cd texinfo && ${MAKE} clean cd texinfo && ${MAKE} clean
# $Id: Makefile,v 1.5 2003-04-19 17:24:28 geuzaine Exp $ # $Id: Makefile,v 1.6 2003-06-13 16:53:07 geuzaine Exp $
# #
# Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
# #
...@@ -59,5 +59,5 @@ all: ps pdf html html1 infoz txt ...@@ -59,5 +59,5 @@ all: ps pdf html html1 infoz txt
clean: clean:
rm -f *.cp* *.fn* *.ky* *.pg* *.tp* *.vr* *.mv*\ rm -f *.cp* *.fn* *.ky* *.pg* *.tp* *.vr* *.mv*\
*.log *.toc *.aux *.dvi *.html *.txt\ *.log *.toc *.aux *.dvi *.html *.txt\
gmsh.ps gmsh.pdf gmsh.info* gmsh-info.tgz gmsh-doc.tgz gmsh.ps gmsh.pdf gmsh.info* gmsh-info.tgz
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment