Changeset 6623 for nanoscale/branches/1.0/Makefile.in

Timestamp:

Nov 14, 2016 1:17:38 PM (6 years ago)

Author:

ldelgass

Message:

Merge selected nanoscale changes from trunk (by hand)

File:

• nanoscale/branches/1.0/Makefile.in (modified) (4 diffs)

nanoscale/branches/1.0/Makefile.in

@@ +1 @@
+WANT_TRACE      = #yes
 
 CC              = @CC@
@@ -33 +34 @@
 SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
 
-DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
+ifdef WANT_TRACE
+DEFINES         = -DWANT_TRACE
+endif
+CONFIGFILE      = renderservers.tcl
+DEFINES         += -DSERVERSFILE=\"$(libdir)/$(CONFIGFILE)\" \
                 -DSVN_VERSION=\"$(SVN_VERSION)\" \
                 -DLOGDIR=\"$(LOGDIR)\" 
@@ -49 +54 @@
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
 
-install: nanoscale renderservers.tcl start_nanoscale.sh
+install: nanoscale $(CONFIGFILE) start_nanoscale.sh
         $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
         $(INSTALL_PROGRAM) start_nanoscale.sh $(bindir)/start_nanoscale.sh
-        $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
+        $(INSTALL_DATA) $(CONFIGFILE) $(libdir)
 
 client: $(CLIENT_OBJS)
@@ -64 +69 @@
 distclean: clean
         $(RM) -r autom4te.cache
-        $(RM) Makefile config.cache config.log config.status config.h renderservers.tcl start_nanoscale.sh
+        $(RM) Makefile config.cache config.log config.status config.h $(CONFIGFILE) start_nanoscale.sh