# HG changeset patch
# User lost
# Date 1240555382 0
# Node ID bae1e3ecdce13e7ea49e36105d52234ccfcfd926
# Parent  51511cf1c9f861ed842d95330276eef9e04ab63c
More preparation for gnulib integration

diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/add.c
--- a/lwar/add.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/add.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/extract.c
--- a/lwar/extract.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/extract.c	Fri Apr 24 06:43:02 2009 +0000
@@ -19,9 +19,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/list.c
--- a/lwar/list.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/list.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/lwar.c
--- a/lwar/lwar.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/lwar.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/main.c
--- a/lwar/main.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/main.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <argp.h>
 #include <errno.h>
@@ -39,6 +37,7 @@
 // command line option handling
 const char *argp_program_version = "LWAR from " PACKAGE_STRING;
 const char *argp_program_bug_address = PACKAGE_BUGREPORT;
+char *program_name;
 
 static error_t parse_opts(int key, char *arg, struct argp_state *state)
 {
@@ -131,6 +130,7 @@
 // assembler on the first file
 int main(int argc, char **argv)
 {
+	program_name = argv[0];
 	argp_parse(&argp, argc, argv, 0, 0, NULL);
 	if (archive_file == NULL)
 	{
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/remove.c
--- a/lwar/remove.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/remove.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include "lwar.h"
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/replace.c
--- a/lwar/replace.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/replace.c	Fri Apr 24 06:43:02 2009 +0000
@@ -19,9 +19,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwar/util.c
--- a/lwar/util.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwar/util.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,6 +23,7 @@
 */
 
 #define __util_c_seen__
+#include <config.h>
 
 #include <malloc.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/expr.c
--- a/lwasm/expr.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/expr.c	Fri Apr 24 06:43:02 2009 +0000
@@ -24,6 +24,8 @@
 
 #define __expr_c_seen__
 
+#include <config.h>
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_bitbit.c
--- a/lwasm/insn_bitbit.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_bitbit.c	Fri Apr 24 06:43:02 2009 +0000
@@ -24,6 +24,7 @@
 
 #define __insn_bitbit_c_seen__
 
+#include <config.h>
 #include <stdlib.h>
 
 #include "lwasm.h"
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_gen.c
--- a/lwasm/insn_gen.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_gen.c	Fri Apr 24 06:43:02 2009 +0000
@@ -19,6 +19,8 @@
 Contains code for parsing general addressing modes (IMM+DIR+EXT+IND)
 */
 
+#include <config.h>
+
 #include <ctype.h>
 #include <stdlib.h>
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_indexed.c
--- a/lwasm/insn_indexed.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_indexed.c	Fri Apr 24 06:43:02 2009 +0000
@@ -24,6 +24,8 @@
 
 #define __insn_indexed_c_seen__
 
+#include <config.h>
+
 #include <ctype.h>
 #include <string.h>
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_inh.c
--- a/lwasm/insn_inh.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_inh.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,6 +23,7 @@
 */
 
 #define __insn_inh_c_seen__
+#include <config.h>
 
 #include "lwasm.h"
 #include "instab.h"
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_logicmem.c
--- a/lwasm/insn_logicmem.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_logicmem.c	Fri Apr 24 06:43:02 2009 +0000
@@ -20,6 +20,7 @@
 Contains code for handling logic/mem instructions
 */
 
+#include <config.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_rel.c
--- a/lwasm/insn_rel.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_rel.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,7 +23,7 @@
 */
 
 #define __insn_rel_c_seen__
-
+#include <config.h>
 #include <stdlib.h>
 
 #include "expr.h"
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_rlist.c
--- a/lwasm/insn_rlist.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_rlist.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,7 +23,7 @@
 */
 
 #define __insn_rlist_c_seen__
-
+#include <config.h>
 #include "lwasm.h"
 #include "instab.h"
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_rtor.c
--- a/lwasm/insn_rtor.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_rtor.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,7 +23,7 @@
 */
 
 #define __insn_rtor_c_seen__
-
+#include <config.h>
 #include "lwasm.h"
 #include "instab.h"
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/insn_tfm.c
--- a/lwasm/insn_tfm.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/insn_tfm.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,7 +23,7 @@
 */
 
 #define __insn_tfm_c_seen__
-
+#include <config.h>
 #include <ctype.h>
 #include <string.h>
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/instab.c
--- a/lwasm/instab.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/instab.c	Fri Apr 24 06:43:02 2009 +0000
@@ -20,9 +20,9 @@
 
 Contains the instruction table for assembling code
 */
+#include <config.h>
 
 #include <stdlib.h>
-
 #define __instab_c_seen__
 #include "instab.h"
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/list.c
--- a/lwasm/list.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/list.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,6 +21,7 @@
 */
 
 #define __list_c_seen__
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/lwasm.c
--- a/lwasm/lwasm.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/lwasm.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,6 +22,7 @@
 */
 
 #define __lwasm_c_seen__
+#include <config.h>
 
 #include <stdarg.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/lwval.c
--- a/lwasm/lwval.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/lwval.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,6 +23,7 @@
 used by LWASM.
 
 */
+#include <config.h>
 
 #include <malloc.h>
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/macro.c
--- a/lwasm/macro.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/macro.c	Fri Apr 24 06:43:02 2009 +0000
@@ -20,6 +20,8 @@
 Contains stuff associated with macro processing
 */
 
+#include <config.h>
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/main.c
--- a/lwasm/main.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/main.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <argp.h>
 #include <errno.h>
@@ -162,10 +160,15 @@
 	"LWASM, a HD6309 and MC6809 cross-assembler"
 };
 
+char *program_name;
+
 // main function; parse command line, set up assembler state, and run the
 // assembler on the first file
 int main(int argc, char **argv)
 {
+
+	program_name = argv[0];
+	
 	// assembler state
 	asmstate_t asmstate = { 0 };
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/output.c
--- a/lwasm/output.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/output.c	Fri Apr 24 06:43:02 2009 +0000
@@ -20,7 +20,7 @@
 
 Contains the code for actually outputting the assembled code
 */
-
+#include <config.h>
 //#include <ctype.h>
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/parse.c
--- a/lwasm/parse.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/parse.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,6 +23,7 @@
 */
 
 #define __parse_c_seen__
+#include <config.h>
 
 #include <ctype.h>
 #include <string.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/pass1.c
--- a/lwasm/pass1.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/pass1.c	Fri Apr 24 06:43:02 2009 +0000
@@ -49,9 +49,7 @@
 code portability (like *pragma).
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/pass2.c
--- a/lwasm/pass2.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/pass2.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include "lwasm.h"
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/pragma.c
--- a/lwasm/pragma.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/pragma.c	Fri Apr 24 06:43:02 2009 +0000
@@ -20,7 +20,7 @@
 
 This file contains stuff associated with lwasm specific strangeness
 */
-
+#include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/pseudo.c
--- a/lwasm/pseudo.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/pseudo.c	Fri Apr 24 06:43:02 2009 +0000
@@ -20,7 +20,7 @@
 
 This file implements the various pseudo operations.
 */
-
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lwasm.h"
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/symbol.c
--- a/lwasm/symbol.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/symbol.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,7 +23,7 @@
 */
 
 #define __symbol_c_seen__
-
+#include <config.h>
 #include <string.h>
 
 #include "lwasm.h"
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwasm/util.c
--- a/lwasm/util.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwasm/util.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,7 +23,7 @@
 */
 
 #define __util_c_seen__
-
+#include <config.h>
 #include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/expr.c
--- a/lwlink/expr.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/expr.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,6 +23,7 @@
 */
 
 #define __expr_c_seen__
+#include <config.h>
 
 #include <ctype.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/link.c
--- a/lwlink/link.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/link.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,9 +21,7 @@
 Resolve section and symbol addresses; handle incomplete references
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/lwlink.c
--- a/lwlink/lwlink.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/lwlink.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,9 +21,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #define __lwlink_c_seen__
 
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/main.c
--- a/lwlink/main.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/main.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <argp.h>
 #include <errno.h>
@@ -34,6 +32,8 @@
 
 #include "lwlink.h"
 
+char *program_name;
+
 // command line option handling
 const char *argp_program_version = "LWLINK from " PACKAGE_STRING;
 const char *argp_program_bug_address = PACKAGE_BUGREPORT;
@@ -158,6 +158,8 @@
 // assembler on the first file
 int main(int argc, char **argv)
 {
+	program_name = argv[0];
+
 	argp_parse(&argp, argc, argv, 0, 0, NULL);
 	if (ninputfiles == 0)
 	{
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/map.c
--- a/lwlink/map.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/map.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,9 +21,7 @@
 Output information about the linking process
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/objdump.c
--- a/lwlink/objdump.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/objdump.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,7 +21,7 @@
 A standalone program to dump an object file in a text form to stdout
 
 */
-
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -32,6 +32,7 @@
 #endif
 
 void read_lwobj16v0(unsigned char *filedata, long filesize);
+char *program_name;
 
 /*
 The logic of reading the entire file into memory is simple. All the symbol
@@ -45,7 +46,8 @@
 	FILE *f;
 	long bread;
 	unsigned char *filedata;
-	
+
+	program_name = argv[0];	
 	if (argc != 2)
 	{
 		fprintf(stderr, "Must specify exactly one input file.\n");
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/output.c
--- a/lwlink/output.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/output.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,9 +21,7 @@
 Actually output the binary
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/readfiles.c
--- a/lwlink/readfiles.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/readfiles.c	Fri Apr 24 06:43:02 2009 +0000
@@ -22,9 +22,7 @@
 
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <argp.h>
 #include <errno.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/script.c
--- a/lwlink/script.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/script.c	Fri Apr 24 06:43:02 2009 +0000
@@ -21,9 +21,7 @@
 Read and parse linker scripts
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
 #include <errno.h>
 #include <stdio.h>
diff -r 51511cf1c9f8 -r bae1e3ecdce1 lwlink/util.c
--- a/lwlink/util.c	Fri Apr 24 06:27:00 2009 +0000
+++ b/lwlink/util.c	Fri Apr 24 06:43:02 2009 +0000
@@ -23,6 +23,7 @@
 */
 
 #define __util_c_seen__
+#include <config.h>
 
 #include <malloc.h>
 #include <stdio.h>