Merge branch 'util/safe-strto' into phys305/gaussian-bump
authorW. Trevor King <wking@tremily.us>
Tue, 12 Feb 2013 18:13:53 +0000 (13:13 -0500)
committerW. Trevor King <wking@tremily.us>
Tue, 12 Feb 2013 18:13:53 +0000 (13:13 -0500)
Conflicts:
Makefile  (add safe-strto dependencies for one_gaussian_bump)

1  2 
Makefile

diff --cc Makefile
index 97c4ac927b6bc9c8ab6a1a7c798a7e06d89f97a5,3a4d7534053bf7ba555773c28a9fa3f4e7b6110e..d66f5f81f7a70e134dbb2e8ea1de25c5ef6bbb4e
+++ b/Makefile
@@@ -64,6 -64,10 +64,10 @@@ TAR = ta
  #   http://www.gnu.org/software/make/manual/html_node/Rules.html
  all: $(PROGRAMS)
  
 -safe-strto-example_OBJECTS = safe-strto-example.o safe-strto.o
 -safe-strto-example.o safe-strto.o: config.h safe-strto.h
+ # Dependency declarations
++one_gaussian_bump_OBJECTS = one_gaussian_bump.o safe-strto.o
++one_gaussian_bump.o safe-strto.o: config.h safe-strto.h
  # target: help - display callable targets
  # Use `grep` to search this file for target comments
  help: