[svn-commits] kpfleming: tools/trunk r4646 - in /tools/trunk: ./ build_tools/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Aug  1 16:37:42 2008
New Revision: 4646

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4646
Log:
reduce the amount of recompiling necessary when the version string changes


Added:
    tools/trunk/version.h   (with props)
Modified:
    tools/trunk/   (props changed)
    tools/trunk/Makefile
    tools/trunk/build_tools/make_version_h
    tools/trunk/dahdi_cfg.c

Propchange: tools/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Aug  1 16:37:42 2008
@@ -32,5 +32,5 @@
 sethdlc
 timertest
 tonezones.txt
-version.h
+version.c
 .*.d

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4646&r1=4645&r2=4646
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Fri Aug  1 16:37:42 2008
@@ -83,9 +83,9 @@
 endif
 
 LTZ_A:=libtonezone.a
-LTZ_A_OBJS:=zonedata.o tonezone.o
+LTZ_A_OBJS:=zonedata.o tonezone.o version.o
 LTZ_SO:=libtonezone.so
-LTZ_SO_OBJS:=zonedata.lo tonezone.lo
+LTZ_SO_OBJS:=zonedata.lo tonezone.lo version.o
 LTZ_SO_MAJOR_VER:=1
 LTZ_SO_MINOR_VER:=0
 
@@ -130,7 +130,7 @@
 
 utils: $(BINS) utils-subdirs
 
-version.h: FORCE
+version.c: FORCE
 	@TOOLSVERSION="${TOOLSVERSION}" build_tools/make_version_h > $@.tmp
 	@if cmp -s $@.tmp $@ ; then :; else \
 		mv $@.tmp $@ ; \
@@ -141,6 +141,8 @@
 
 $(UTILS): %: %.o
 
+$(UTILS): version.o
+
 %.o: %.c
 	$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $<
 
@@ -150,7 +152,7 @@
 %: %.o
 	$(CC) $(LDFLAGS) -o $@ $^
 
-prereq: config.status version.h
+prereq: config.status
 
 dahdi_tool: CFLAGS+=$(NEWT_INCLUDE)
 dahdi_tool: LDFLAGS+=$(NEWT_LIB)

Modified: tools/trunk/build_tools/make_version_h
URL: http://svn.digium.com/view/dahdi/tools/trunk/build_tools/make_version_h?view=diff&rev=4646&r1=4645&r2=4646
==============================================================================
--- tools/trunk/build_tools/make_version_h (original)
+++ tools/trunk/build_tools/make_version_h Fri Aug  1 16:37:42 2008
@@ -1,10 +1,10 @@
 #!/bin/sh
 cat << END
 /*
- * version.h 
+ * version.c
  * Automatically generated
  */
 
-static const char tools_version[] = "DAHDI Tools Version - ${TOOLSVERSION}";
+const char dahdi_tools_version[] = "DAHDI Tools Version - ${TOOLSVERSION}";
 
 END

Modified: tools/trunk/dahdi_cfg.c
URL: http://svn.digium.com/view/dahdi/tools/trunk/dahdi_cfg.c?view=diff&rev=4646&r1=4645&r2=4646
==============================================================================
--- tools/trunk/dahdi_cfg.c (original)
+++ tools/trunk/dahdi_cfg.c Fri Aug  1 16:37:42 2008
@@ -1338,7 +1338,7 @@
 		c = argv0;
 	else
 		c++;
-	fprintf(stderr, "%s\n", tools_version);
+	fprintf(stderr, "%s\n", dahdi_tools_version);
 	fprintf(stderr, 
 		"Usage: %s [options]\n"
 		"    Valid options are:\n"
@@ -1393,7 +1393,7 @@
 	}
 	
 	if (verbose) {
-		fprintf(stderr, "%s\n", tools_version);
+		fprintf(stderr, "%s\n", dahdi_tools_version);
 	}
 
 	if (fd == -1) fd = open(MASTER_DEVICE, O_RDWR);

Added: tools/trunk/version.h
URL: http://svn.digium.com/view/dahdi/tools/trunk/version.h?view=auto&rev=4646
==============================================================================
--- tools/trunk/version.h (added)
+++ tools/trunk/version.h Fri Aug  1 16:37:42 2008
@@ -1,0 +1,22 @@
+/*
+ * Copyright (C) 2008 Digium, Inc.
+ *
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under thet erms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+extern const char *dahdi_tools_version;

Propchange: tools/trunk/version.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tools/trunk/version.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tools/trunk/version.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain