Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/vis15/Makefile.in
ViewVC logotype

Diff of /branches/vis15/Makefile.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4972, Sat Apr 29 15:15:47 2017 UTC revision 4973, Mon May 1 13:34:25 2017 UTC
# Line 12  Line 12 
12  INSTALL =       @INSTALL@  INSTALL =       @INSTALL@
13    
14  ifeq (@LOGGING_ENABLED@,true)  ifeq (@LOGGING_ENABLED@,true)
15  BUILD_DIRS =    src/logging/gen  BUILD_DIRS =    src/logging/log-analyze \
16                    src/logging/log-dump
17    LOG_HEADER =    src/lib/include/diderot/log-events.hxx
18    LOG_GEN_DIR =   src/logging/gen
19  endif  endif
20    
21  BUILD_DIRS +=   src/compiler \  BUILD_DIRS +=   src/compiler \
# Line 62  Line 65 
65          mkdir -p $(INSTALL_DIR)/include/diderot          mkdir -p $(INSTALL_DIR)/include/diderot
66          (cd src/lib/include/diderot/; cp -p *.h *.hxx $(INSTALL_DIR)/include/diderot) || exit $$?          (cd src/lib/include/diderot/; cp -p *.h *.hxx $(INSTALL_DIR)/include/diderot) || exit $$?
67    
68  build:  build:          $(LOG_HEADER)
69          for dir in $(BUILD_DIRS); do \          for dir in $(BUILD_DIRS); do \
70            (cd $$dir && $(MAKE) build) || exit $$?; \            (cd $$dir && $(MAKE) build) || exit $$?; \
71          done          done
# Line 70  Line 73 
73  doc:  doc:
74          (cd doc; $(MAKE))          (cd doc; $(MAKE))
75    
76    ifeq (@LOGGING_ENABLED@,true)
77    $(LOG_HEADER):
78            (cd $(LOG_GEN_DIR); ./log-gen.sh) || exit $$?
79    endif
80    
81  #################### Cleanup ####################  #################### Cleanup ####################
82    
83  CLEAN_SUBDIRS =         $(BUILD_DIRS)  CLEAN_SUBDIRS =         $(BUILD_DIRS) $(LOG_GEN_DIR)
84    
85  CLEAN_FILES =           rtest/tests/*/out.nrrd  CLEAN_FILES =           rtest/tests/*/out.nrrd
86    
# Line 87  Line 95 
95                          rtest/report.* \                          rtest/report.* \
96                          src/lib/include/diderot/config.h \                          src/lib/include/diderot/config.h \
97                          src/lib/include/diderot/log-events.hxx \                          src/lib/include/diderot/log-events.hxx \
98                          src/lib/include/diderot/logging.hxx                          src/lib/include/diderot/logging.hxx \
99                            src/logging/lib/default-log-paths.hxx
100    
101  DEVCLEAN_FILES =        configure \  DEVCLEAN_FILES =        configure \
102                          config/config_h.in                          config/config_h.in

Legend:
Removed from v.4972  
changed lines
  Added in v.4973

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0