Commit 82bfbb59 authored by js9's avatar js9

- added an ALLSUBDIRS target to some Makefile.in's

- used ALLSUBDIRS for distclean when possible (and SUBDIRS otherwise)
- do not add database plugins depending on missing 3rd party libraries
  to ALLSUBDIRS -- this prevents their makefiles from ever being created
- add some missing optional dirs to tools/Makefile.in
- clean the file-symlinks (but not the dir-symlinks) in lib/Makefile.in
- add rm Makefile to various Makefile.in's with explicit distclean targets
- fixed GLEW's clean to not remove links to include files; leave that
  for distclean



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@1974 18c085ea-50e0-402c-830e-de6fd14e8384
parent 35a1b233
......@@ -80,6 +80,9 @@
# generate dependencies. That's now reserved for distclean.
# In this case, it means removing moc only in 'distclean'.
#
# Jeremy Meredith, Thu Sep 6 16:53:41 EDT 2007
# Don't forget to remove the Makefile in distclean.
#
##############################################################################
@SET_MAKE@
......@@ -97,4 +100,4 @@ clean:
$(RM) *.log *.timings
distclean: clean
$(RM) moc
$(RM) moc Makefile
......@@ -293,6 +293,15 @@
# for all directories. We just want the latter, so I copied the
# non-subdir referencing stuff from the clean target to distclean.
#
# Jeremy Meredith, Thu Sep 6 16:50:53 EDT 2007
# Having all thirdparty-dependent in ALLSUBDIRS is useless: we wind up
# generating a Makefile for a directory that we know we will not be
# able to build. And, in fact, we cannot even generate dependencies for
# it since we don't even have include files, and as such, even a make
# distclean will fail. Thus, I changed ALLSUBDIRS to ignore third-party-
# dependent libraries we cannot build.
# Also, use ALLSUBDIRS for distclean.
#
##############################################################################
@SET_MAKE@
......@@ -377,7 +386,7 @@ MINIMAL=Curve2D Silo VTK
THIRDPARTY_DEPENDENT=@EXODUS@ @HDF4@ @HDF5@ @PDB@ @MILI@ @BOXLIB2D@ @BOXLIB3D@ @VISUS@ @NETCDF@ @CGNS@ @GDAL@ @CFITSIO@ @ITAPS_C@ @ITAPS_S@ @H5PART@ @CCMIO@
SUBDIRS=@DB_BUILD_DIRS@
ALLSUBDIRS=$(REQUIRED) $(EXODUS) $(HDF4) $(HDF5) $(MILI) $(PDB) $(BOXLIB2D) $(BOXLIB3D) $(VISUS) $(NETCDF) $(CGNS) $(GDAL) $(CFITSIO) $(ITAPS_C) $(ITAPS_S) $(H5PART) $(CCMIO) $(SAMPLES) $(OPTIONAL)
ALLSUBDIRS=$(REQUIRED) $(THIRDPARTY_DEPENDENT) $(SAMPLES) $(OPTIONAL)
message:
@echo
......@@ -403,8 +412,8 @@ clean:
-$(RM) $(CLEAN_FILES)
distclean:
if test -n "$(SUBDIRS)"; then \
rev=""; for dir in $(SUBDIRS); do rev="$$dir $$rev"; done; \
if test -n "$(ALLSUBDIRS)"; then \
rev=""; for dir in $(ALLSUBDIRS); do rev="$$dir $$rev"; done; \
for dir in $$rev; do (cd $$dir && test ! -f Makefile || $(MAKE) $@); done \
fi
-$(RM) $(DISTCLEAN_FILES) *~ core
......
......@@ -67,6 +67,9 @@
# generate dependencies. That's now reserved for distclean.
# In this case, it means removing the symlinks only in 'distclean'.
#
# Jeremy Meredith, Thu Sep 6 16:53:41 EDT 2007
# Don't forget to remove the Makefile in distclean.
#
##############################################################################
@SET_MAKE@
......@@ -97,7 +100,7 @@ incqt:
clean:
distclean:
$(RM) python vtk mesa qt
$(RM) python vtk mesa qt Makefile
install:
install_bin:
......
......@@ -42,8 +42,14 @@ clean:
## for all directories. We just want the latter, so I copied the
## non-subdir referencing stuff from the clean target to distclean.
##
## Jeremy Meredith, Thu Sep 6 17:04:36 EDT 2007
## Try ALLSUBDIRS for distclean before resorting to SUBDIRS.
##
distclean:
if test -n "$(SUBDIRS)"; then \
if test -n "$(ALLSUBDIRS)"; then \
rev=""; for dir in $(ALLSUBDIRS); do rev="$$dir $$rev"; done; \
for dir in $$rev; do (cd $$dir && $(MAKE) $@); done \
elif test -n "$(SUBDIRS)"; then \
rev=""; for dir in $(SUBDIRS); do rev="$$dir $$rev"; done; \
for dir in $$rev; do (cd $$dir && $(MAKE) $@); done \
fi
......
......@@ -162,10 +162,16 @@
# Added '*' after $(LIBMESAGL) and $(LIBOSMESA) to pick up extensions that
# some versions of linux add.
#
# Jeremy Meredith, Thu Aug 30 12:55:30 EDT 2007
# Made the 'clean' target not remove things needed to correctly
# generate dependencies. That's now reserved for distclean.
# In this case, it means removing the symbolic links only in 'distclean'.
# Jeremy Meredith, Thu Aug 30 12:55:30 EDT 2007
# Made the 'clean' target not remove things needed to correctly
# generate dependencies. That's now reserved for distclean.
# In this case, it means removing the symbolic links only in 'distclean'.
#
# Jeremy Meredith, Thu Sep 6 16:03:21 EDT 2007
# Allowed make clean to remove symlinks to library files, since these
# are not needed for dependencies. I left the python link for distclean,
# though, since it is to a directory which contains include files.
# Also, don't forget to remove the Makefile in distclean.
#
##############################################################################
......@@ -195,6 +201,7 @@ LIBOSMESA=libOSMesa.@SHLIB_LIBEXT@
LIBQT=@LIBQT@.@SHLIB_LIBEXT@
LIBQUI=libqui.@SHLIB_LIBEXT@
LIBSILO=libsilo.@SHLIB_LIBEXT@
LIBPYTHON=lib@PYVERSION@.@SHLIB_LIBEXT@
# The following targets were split up so that they would work properly
# with the make on AIX systems.
......@@ -313,7 +320,7 @@ pythondir:
if test -n "@PYDIR@"; then \
$(RM) python lib@PYVERSION@.@SHLIB_LIBEXT@ ; \
ln -s @PYDIR@ python ; \
ln -s python/lib/@PYVERSION@/config/lib@PYVERSION@.@SHLIB_LIBEXT@ . ; \
ln -s python/lib/@PYVERSION@/config/$(LIBPYTHON) . ; \
fi
create_silo_link:
......@@ -395,8 +402,6 @@ cleanlinks:
find . -type l -maxdepth 1 -exec $(RM) {} \;
clean:
distclean: cleanlinks
$(RM) \
$(LIBMESAGL)* \
$(LIBGLU) \
......@@ -422,10 +427,11 @@ distclean: cleanlinks
$(LIBVTKGRAPHICS)* \
$(LIBVTKRENDERING)* \
$(LIBSILO) \
python \
lib@PYVERSION@.@SHLIB_LIBEXT@ \
$(LIBQT) \
$(LIBQUI)
libqt.a \
libqui.a
distclean: cleanlinks
$(RM) python Makefile
install:
install_bin:
......
......@@ -226,6 +226,9 @@
# for all directories. We just want the latter, so I copied the
# non-subdir referencing stuff from the clean target to distclean.
#
# Jeremy Meredith, Thu Sep 6 16:53:41 EDT 2007
# Use ALLSUBDIRS for distclean.
#
##############################################################################
@SET_MAKE@
......@@ -272,8 +275,8 @@ clean:
-$(RM) $(CLEAN_FILES)
distclean:
if test -n "$(SUBDIRS)"; then \
rev=""; for dir in $(SUBDIRS); do rev="$$dir $$rev"; done; \
if test -n "$(ALLSUBDIRS)"; then \
rev=""; for dir in $(ALLSUBDIRS); do rev="$$dir $$rev"; done; \
for dir in $$rev; do (cd $$dir && test ! -f Makefile || $(MAKE) $@); done \
fi
-$(RM) $(DISTCLEAN_FILES) *~ core
......
......@@ -158,6 +158,9 @@
# for all directories. We just want the latter, so I copied the
# non-subdir referencing stuff from the clean target to distclean.
#
# Jeremy Meredith, Thu Sep 6 16:53:41 EDT 2007
# Use ALLSUBDIRS for distclean.
#
##############################################################################
@SET_MAKE@
......@@ -202,8 +205,8 @@ clean:
-$(RM) $(CLEAN_FILES)
distclean:
if test -n "$(SUBDIRS)"; then \
rev=""; for dir in $(SUBDIRS); do rev="$$dir $$rev"; done; \
if test -n "$(ALLSUBDIRS)"; then \
rev=""; for dir in $(ALLSUBDIRS); do rev="$$dir $$rev"; done; \
for dir in $$rev; do (cd $$dir && test ! -f Makefile || $(MAKE) $@); done \
fi
-$(RM) $(DISTCLEAN_FILES) *~ core
......
......@@ -60,6 +60,10 @@
# Eric Brugger, Fri Jun 29 09:22:02 PDT 2007
# Removed the setting of the DISTRIB and NOT_DISTRIB variables.
#
# Jeremy Meredith, Thu Sep 6 16:07:44 EDT 2007
# Only remove files needed to generate dependencies when we execute
# the 'distclean' target, not the 'clean' target.
#
##############################################################################
##
......@@ -88,8 +92,8 @@ all: message $(LIBSHARED)
clean:
$(RM) $(OBJ) $(LIBSHARED) credits.html
$(RM) -rf glew
$(RM) -R ../../include/glew
DISTCLEAN_FILES=-rf glew ../../include/glew
credits.html:
gunzip < glew-1.3.4-src.tgz | tar xvf - > /dev/null
......
......@@ -96,6 +96,10 @@
# Brad Whitlock, Tue Sep 19 17:37:36 PST 2006
# Added mpeg2encode and imagetools.
#
# Jeremy Meredith, Thu Sep 6 17:00:22 EDT 2007
# Add missing dirs to the OPTIONAL variable. Create ALLSUBDIRS. This
# will help distclean fix things up.
#
##############################################################################
@SET_MAKE@
......@@ -104,11 +108,14 @@
MILI=makemili
OPTIONAL=avtprep classwriter doxygenate prep windowmaker
OPTIONAL=avtprep classwriter doxygenate prep windowmaker \
escan mpeg_encode clidriver DataManualExamples clipeditor
SUBDIRS=imagetools annotations convert curv3dprep @MILI@ mpeg2encode silex \
surfcomp writer xml xmledit
ALLSUBDIRS=$(SUBDIRS) $(MILI) $(OPTIONAL)
message:
@echo
@echo "****************************************************************************"
......
......@@ -56,6 +56,8 @@
# endorsement purposes.
#
# Modifications:
# Jeremy Meredith, Thu Sep 6 17:03:24 EDT 2007
# Added an ALLSUBDIRS variable to help distclean.
#
##############################################################################
......@@ -70,6 +72,8 @@ PY_BUILD_VISITMODULE=@PY_BUILD_VISITMODULE@
# subdirectory `visitpy' must be first.
SUBDIRS=visitpy cli $(PY_BUILD_VISITMODULE)
ALLSUBDIRS=$(SUBDIRS) visitmodule
message:
@echo
@echo "****************************************************************************"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment