[fU-cvs] libfunutil/toc/make toc_functions.make,1.1,1.2

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv24445/toc/make

Modified Files:
	toc_functions.make 
Log Message:
Fixed a horrible bug, where $@ was used as the target filename (which is correct is most cases so far, but is not correct in all cases).

Index: toc_functions.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/toc_functions.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- toc_functions.make	1 Sep 2003 05:09:30 -0000	1.1
+++ toc_functions.make	5 Sep 2003 09:31:44 -0000	1.2
@@ -16,9 +16,9 @@
 $(error Could not find TOC_ATPARSER_BIN at $(TOC_ATPARSER_BIN)!)
 endif
 toc_atparse_file = \
-        $(TOC_ATPARSER_BIN) $(3) < $(1) > $(2).tmp; \
+        echo -n 'toc_atparse_file: '; $(TOC_ATPARSER_BIN) $(3) < $(1) > $(2).tmp; \
                 if cmp -s $(2).tmp $(2); then rm -f $(2).tmp; echo "$(2) is up to date."; \
-                else mv -f $(2).tmp $@; echo "Updated $(2)."; fi
+                else mv -f $(2).tmp $(2); echo "Updated $(2)."; fi
 
 
 ######################################################################
@@ -42,7 +42,7 @@
 # toc_compile_c_binary call()able function:
 # compiles/links list of source files [$($(1)_bin_SOURCES) $($(1)_bin_OBJECTS)and $(2)]
 # to create $(1). It uses the optional $($(1)_bin_CFLAGS).
-toc_compile_c_binary = $(CC) $(CFLAGS) $($(1)_bin_CFLAGS) -o $(1) $($(1)_bin_SOURCES) $($(1)_bin_OBJECTS) $(2)
+toc_compile_c_binary = $(CC) $(C_BINS_FROM_SOURCES_CFLAGS)  $(CFLAGS) $($(1)_bin_CFLAGS) -o $(1) $($(1)_bin_SOURCES) $($(1)_bin_OBJECTS) $(2) $(C_BINS_FROM_SOURCES_LFLAGS) $($(1)_bin_LFLAGS)
 
 
 ######################################################################