diff --git a/Makefile.OS4 b/Makefile.OS4
index 047f732..b4bec72 100644
--- a/Makefile.OS4
+++ b/Makefile.OS4
@@ -7,7 +7,7 @@ OUTFMTS = -DOUTAOUT -DOUTBIN -DOUTELF -DOUTHUNK -DOUTSREC -DOUTTOS -DOUTVOBJ \
 
 CC = vc +aosppc
 CCOUT = -o 
-COPTS = -c -DAMIGA -O1 $(OUTFMTS)
+COPTS = -c -DAMIGA -D__USE_INLINE__ -O1 $(OUTFMTS)
 
 LD = $(CC)
 LDOUT = $(CCOUT)
diff --git a/Makefile.PUp b/Makefile.PUp
index a23bd1c..91c0fe7 100644
--- a/Makefile.PUp
+++ b/Makefile.PUp
@@ -11,7 +11,7 @@ COPTS = -c -c99 -DAMIGA -O1 $(OUTFMTS)
 
 LD = $(CC)
 LDOUT = $(CCOUT)
-LDFLAGS = -lm
+LDFLAGS = -lm -lamiga
 
 RM = delete force quiet
 
diff --git a/Makefile.WOS b/Makefile.WOS
index b186ff3..ff0b062 100644
--- a/Makefile.WOS
+++ b/Makefile.WOS
@@ -11,7 +11,7 @@ COPTS = -c -c99 -DAMIGA -O1 $(OUTFMTS)
 
 LD = $(CC)
 LDOUT = $(CCOUT)
-LDFLAGS = -lm
+LDFLAGS = -lm -lamiga
 
 RM = delete force quiet
 
diff --git a/cond.c b/cond.c
index 910065a..dd46320 100644
--- a/cond.c
+++ b/cond.c
@@ -34,7 +34,7 @@ void cond_check(void)
 }
 
 
-/* establish a new level of condititional assembly */
+/* establish a new level of conditional assembly */
 void cond_if(char flag)
 {
   if (++clev >= MAXCONDLEV)
diff --git a/doc/cpu_jagrisc.texi b/doc/cpu_jagrisc.texi
index f62b347..2ec0e1d 100644
--- a/doc/cpu_jagrisc.texi
+++ b/doc/cpu_jagrisc.texi
@@ -108,7 +108,7 @@ compatibility with various syntax modules.
 @item Encoding of @code{MOVEI} instruction in little-endian mode is unkown.
 @item The developer has to provide the necessary @code{NOP} instructions
       after jumps, or @code{OR} instructions to work around hardware bugs,
-      himself.
+      her/himself.
 
 @end itemize
 
diff --git a/doc/output_hunk.texi b/doc/output_hunk.texi
index c77d64b..2c8d6dd 100644
--- a/doc/output_hunk.texi
+++ b/doc/output_hunk.texi
@@ -9,7 +9,7 @@ selected with the @option{-Fhunk} option to generate objects and with the
 
 @section Additional options for this module
 @table @option
-    @iten -hunkpad=<code>
+    @item -hunkpad=<code>
         Sets a two-byte code used for aligning a code hunk to the
         next 32-bit border. Defaults to 0x4e71 on M68k to allow linking
         of functions which extend over two object files.
diff --git a/doc/syntax_mot.texi b/doc/syntax_mot.texi
index beb44b3..ea6f538 100644
--- a/doc/syntax_mot.texi
+++ b/doc/syntax_mot.texi
@@ -45,10 +45,10 @@ This syntax module provides the following additional options:
 
 @item -localu
  Local symbols are prefixed by @code{'_'} instead of @code{'.'}. For
- Devpac compatbility, which offers a similar option.
+ Devpac compatibility, which offers a similar option.
 
 @item -phxass
- PhxAss-compatibilty mode. Only directives known to PhxAss are recognized.
+ PhxAss-compatibility mode. Only directives known to PhxAss are recognized.
  Enables the following features:
 @itemize @minus
   @item @code{section <name>} starts a code section named @code{<name>}
@@ -480,6 +480,25 @@ CPU- and output-module support them):
 @item ifmacrond <macro>
       Conditionally assemble the following line if <macro> is undefined.
 
+@item iif <expression> <statement>
+      Conditionally assemble the <statement> following <expression>.
+      IIF stands for Immediate IF.
+      If the value of <expression> is non-zero then <statement> is assembled.
+      No @code{ENDC} should be used in conjunction with this directive.
+      The <statement> can not include a label, but a label may precede the
+      @code{IIF} directive. For example:
+      @code{foo IIF bar equ 42}
+      The @code{foo} label will be assigned with @code{42} if @code{bar}
+      evaluates to true, otherwise @code{foo} will be assigned with the
+      current program counter.
+      The case when assigning a value in the @code{IIF <statement>} using
+      the equal (@code{=}) operator and the option @option{-spaces}
+      is used can't work as the equal operator
+      will be evaluated as part of the expression.
+      I.e. @code{foo IIF 1+1 = 42} will work, but @code{foo IIF 1 + 1 = 42}
+      when the option @option{-spaces} is specified won't work as
+      @code{= 42} will be evaluated as part of the expression.
+
 @item incbin <file>[,<offset>[,<length>]]
       Inserts the binary contents of <file> into the object code at
       this position. When <offset> is specified, then the given number
@@ -488,7 +507,7 @@ CPU- and output-module support them):
       from that file.
       The file will be searched first in the current
       directory, then in all paths defined by @option{-I} or @code{incdir}
-      in the order of occurence.
+      in the order of occurrence.
 
 @item incdir <path>
       Add another path to search for include files to the list of
@@ -499,7 +518,7 @@ CPU- and output-module support them):
       Include source text of <file> at this position. The include file
       will be searched first in the current directory, then in all
       paths defined by @option{-I} or @code{incdir} in the order of
-      occurence.
+      occurrence.
 
 @item inline
       Local labels in the following block are isolated from previous
@@ -678,11 +697,11 @@ CPU- and output-module support them):
       contain a new value from now on.
 
 @item setfo <expression>
-      Sets the stack-frame offset counter to <expresion>.
+      Sets the stack-frame offset counter to <expression>.
       See @code{fo} directive.
 
 @item setso <expression>
-      Sets the structure offset counter to <expresion>.
+      Sets the structure offset counter to <expression>.
       See @code{so} directive.
 
 @item <label> so.<size> <expression>
@@ -742,7 +761,7 @@ This module has the following error messages:
 @itemize @minus
 @item 1001: mnemonic expected
 @item 1002: invalid extension
-@item 1003: no space before oprands
+@item 1003: no space before operands
 @item 1004: too many closing parentheses
 @item 1005: missing closing parentheses
 @item 1006: missing operand
diff --git a/doc/vasm_main.texi b/doc/vasm_main.texi
index 16e3945..4827d07 100644
--- a/doc/vasm_main.texi
+++ b/doc/vasm_main.texi
@@ -41,6 +41,12 @@ or additional options.
         Prints dependencies in the same way as @option{-depend}, but
         will also print all include files with absolute paths.
 
+@item -depfile <filename>
+        Used together with @option{-depend} or @option{-dependall} and
+        instructs vasm to output all dependencies to a new file, instead
+        of stdout. Code will be generated in parallel to the dependencies
+        output.
+
 @item -dwarf[=<version>]
         Automatically generate DWARF debugging sections, suitable for
         source level debugging. When the version specification is missing
@@ -410,7 +416,7 @@ The frontend has the following error messages:
 @item 26: missing end directive for macro "%s"
 @item 27: macro definition inside macro "%s"
 @item 28: maximum number of %d macro arguments exceeded
-@item 29: option -%c was specified twice
+@item 29: option %s was specified twice
 @item 30: read error on <%s>
 @item 31: expression must be constant
 @item 32: initialized data in bss
diff --git a/dwarf.c b/dwarf.c
index b1cf9bb..4ab673d 100644
--- a/dwarf.c
+++ b/dwarf.c
@@ -62,7 +62,7 @@ static struct DWinclude *new_dwinc(char *name)
 
 /* DWARF needs source file lists with the file name part only, but without
    any path in it. Include paths are put into another list. */
-static void make_file_lists(char *compdir,struct source_file *first_source)
+static void make_file_lists(struct source_file *first_source)
 {
   struct source_file *srcnode;
   struct include_path *incnode;
@@ -84,8 +84,8 @@ static void make_file_lists(char *compdir,struct source_file *first_source)
 
     if ((incnode = srcnode->incpath) != NULL) {
       if (incnode->compdir_based) {
-        if (compdir != NULL)
-          strcpy(pathbuf,compdir);
+        if (compile_dir != NULL)
+          strcpy(pathbuf,compile_dir);
         else
           ierror(0);
       }
@@ -144,7 +144,7 @@ static void make_file_lists(char *compdir,struct source_file *first_source)
 }
 
 
-void dwarf_init(struct dwarf_info *dinfo,char *compile_dir,
+void dwarf_init(struct dwarf_info *dinfo,
                 struct include_path *first_incpath,
                 struct source_file *first_source)
 {
@@ -279,7 +279,7 @@ void dwarf_init(struct dwarf_info *dinfo,char *compile_dir,
     add_data_atom(dsec,1,1,stdopclengths[i]);
 
   /* make lists of DWARF directories and files */
-  make_file_lists(compile_dir,first_source);
+  make_file_lists(first_source);
 
   /* list of include directories, CWD-entry (index 0) is not written */
   for (dwinc=first_dwinc; dwinc; dwinc=dwinc->next)
diff --git a/dwarf.h b/dwarf.h
index 2ed6350..f455f3c 100644
--- a/dwarf.h
+++ b/dwarf.h
@@ -59,7 +59,7 @@ struct dwarf_info {
 
 
 /* functions */
-void dwarf_init(struct dwarf_info *,char *,struct include_path *,struct source_file *);
+void dwarf_init(struct dwarf_info *,struct include_path *,struct source_file *);
 void dwarf_finish(struct dwarf_info *);
 void dwarf_end_sequence(struct dwarf_info *,section *);
 void dwarf_line(struct dwarf_info *,section *,int,int);
diff --git a/error.c b/error.c
index e0abbb8..ee3d69b 100644
--- a/error.c
+++ b/error.c
@@ -69,6 +69,19 @@ static void print_source_line(FILE *f)
 }
 
 
+static void print_source_file(FILE *f, source *src)
+{
+  if (src->srcfile)
+    fprintf(f,"\"%s%s%s\"",
+            src->srcfile->incpath->compdir_based
+            ? compile_dir : "",
+            src->srcfile->incpath->path,
+            src->srcfile->name);
+  else
+    fprintf(f,"\"%s\"",src->name);
+}
+
+
 static void error(int n,va_list vl,struct err_out *errlist,int offset)
 {
   static source *last_err_source = NULL;
@@ -81,6 +94,8 @@ static void error(int n,va_list vl,struct err_out *errlist,int offset)
     return;
 
   if ((flags&MESSAGE) && !(flags&(WARNING|ERROR|FATAL))) {
+    if (nostdout)
+      return;
     f = stdout;  /* print messages to stdout */
   }
   else {
@@ -119,10 +134,10 @@ static void error(int n,va_list vl,struct err_out *errlist,int offset)
   else if (flags & MESSAGE)
     fprintf(f,"message");
   fprintf(f," %d",n+offset);
-  if (!(flags & NOLINE) && cur_src!=NULL)
-    fprintf(f," in line %d of \"%s%s\"",cur_src->line,
-            cur_src->srcfile?cur_src->srcfile->incpath->path:"",
-            cur_src->name);
+  if (!(flags & NOLINE) && cur_src!=NULL) {
+    fprintf(f," in line %d of ",cur_src->line);
+    print_source_file(f,cur_src);
+  }
   fprintf(f,": ");
   vfprintf(f,errlist[n].text,vl);
   fprintf(f,"\n");
@@ -138,9 +153,8 @@ static void error(int n,va_list vl,struct err_out *errlist,int offset)
           fprintf(f,"\tcalled");    /* macro called from */
         else
           fprintf(f,"\tincluded");  /* included from */
-        fprintf(f," from line %d of \"%s%s\"",child->parent_line,
-                parent->srcfile?parent->srcfile->incpath->path:"",
-                parent->name);
+        fprintf(f," from line %d of ",child->parent_line);
+        print_source_file(f,parent);
 
         recurs = 1;
         while (parent->parent!=NULL &&
diff --git a/error.h b/error.h
index a9d3134..6ae19c9 100644
--- a/error.h
+++ b/error.h
@@ -2,7 +2,7 @@
 /* (c) in 2002-2009,2015,2018 by Volker Barthelmann and Frank Wille */
 
 #ifndef ERROR_H
-#define ERROR_H                                                                                
+#define ERROR_H
 
 #define FIRST_GENERAL_ERROR 1
 #define FIRST_SYNTAX_ERROR 1001
diff --git a/expr.c b/expr.c
index eb31baf..4d984a1 100644
--- a/expr.c
+++ b/expr.c
@@ -1,5 +1,5 @@
 /* expr.c expression handling for vasm */
-/* (c) in 2002-2018 by Volker Barthelmann and Frank Wille */
+/* (c) in 2002-2019 by Volker Barthelmann and Frank Wille */
 
 #include "vasm.h"
 
@@ -950,12 +950,12 @@ int eval_expr(expr *tree,taddr *result,section *sec,taddr pc)
   case SUB:
     find_base(tree->left,&lsym,sec,pc);
     find_base(tree->right,&rsym,sec,pc);
-    if(cnst==0&&lsym!=NULL&&rsym!=NULL&&LOCREF(rsym)){
-      if(LOCREF(lsym)&&lsym->sec==rsym->sec){
+    if(cnst==0&&rsym!=NULL&&LOCREF(rsym)){
+      if(lsym!=NULL&&LOCREF(lsym)&&lsym->sec==rsym->sec){
         /* l2-l1 is constant when both have a valid symbol-base, and both
            symbols are LABSYMs from the same section, e.g. (sym1+x)-(sym2-y) */
         cnst=1;
-      }else if(rsym->sec==sec&&(EXTREF(lsym)||LOCREF(lsym))){
+      }else if(lsym!=NULL&&(rsym->sec==sec&&(EXTREF(lsym)||LOCREF(lsym)))){
         /* Difference between symbols from different section or between an
            external symbol and a symbol from the current section can be
            represented by a REL_PC, so we calculate the addend. */
@@ -966,7 +966,9 @@ int eval_expr(expr *tree,taddr *result,section *sec,taddr pc)
           val=(pc-rval+lval-(lsym->sec?lsym->sec->org:0));
           break;
         }
-      }
+      }else if(lsym==NULL&&(rsym->flags&ABSLABEL))
+        /* const-label is valid and yields a const in absolute ORG sections */
+        cnst=1;
     }
     val=(lval-rval);
     break;
diff --git a/general_errors.h b/general_errors.h
index f4fe943..2d33f40 100644
--- a/general_errors.h
+++ b/general_errors.h
@@ -26,7 +26,7 @@
   "missing end directive for macro \"%s\"",ERROR|FATAL,         /* 25 */
   "macro definition inside macro \"%s\"",ERROR|FATAL,
   "maximum number of %d macro arguments exceeded",ERROR,
-  "option -%c was specified twice",NOLINE|WARNING,
+  "option %s was specified twice",NOLINE|WARNING,
   "read error on <%s>",NOLINE|ERROR|FATAL,
   "expression must be constant",ERROR,                          /* 30 */
   "initialized data in bss",WARNING,
diff --git a/history b/history
index 216e556..9857cad 100644
--- a/history
+++ b/history
@@ -1,13 +1,24 @@
 vasm history
 =============
 
-- 1.8g (NO-RELEASE)
+- 1.8g (04.10.19)
+o Do not print informational messages when generating dependencies.
+o New option -depfile to specify a file name for the dependency output.
+  Code generation may happen in parallel in this case.
+o Include the compile directory in the path, when printing error messages.
+o Treat a subtraction of a label from a constant as constant, when the
+  label is from an absolute ORG section.
 o m68k: -opt-allbra makes sure that branch-optimization is enabled.
 o z80: "ld (BC/DE/HL),abs" is an illegal addressing mode.
 o mot-syntax: SECTION directive with a single argument is interpreted as
   section-type when the output format is "tos". Otherwise the type
   defaults to CODE.
 o mot-syntax: In devpac-compatibility mode allow '@' in the middle of labels.
+o mot-syntax: -phxass compatibility mode allows dots ('.') in labels (-ldots).
+o mot-syntax: Added support for Devpac IIF directive.
+o output-hunk: Fixed LINE debug hunk output (-linedebug). Now it can
+  deal with code from multiple sources and the line numbers for
+  executing macros and repetitions are correct.
 o output-hunk: New option -hunkpad=<code> selects the padding code for
   code sections to achieve 32-bit alignment. Default to 0x4e71 (NOP)
   for M68k.
diff --git a/osdep.c b/osdep.c
index 1ddee32..8bee676 100644
--- a/osdep.c
+++ b/osdep.c
@@ -167,10 +167,13 @@ char *get_workdir(void)
 {
   static char buf[MAX_WORKDIR_LEN];
 
+#ifndef __amigaos4__
   if (DOSBase->dl_lib.lib_Version < 36)
     buf[0] = '\0';
-  else if (!GetCurrentDirName(buf,MAX_WORKDIR_LEN))
-    buf[0] = '\0';
+  else
+#endif
+    if (!GetCurrentDirName(buf,MAX_WORKDIR_LEN))
+      buf[0] = '\0';
   return buf;
 }
 
diff --git a/output_hunk.c b/output_hunk.c
index d50d9dd..f00eea8 100644
--- a/output_hunk.c
+++ b/output_hunk.c
@@ -5,7 +5,7 @@
 #include "osdep.h"
 #include "output_hunk.h"
 #if defined(OUTHUNK) && (defined(VASM_CPU_M68K) || defined(VASM_CPU_PPC))
-static char *copyright="vasm hunk format output module 2.10a (c) 2002-2019 Frank Wille";
+static char *copyright="vasm hunk format output module 2.11 (c) 2002-2019 Frank Wille";
 int hunk_onlyglobal;
 
 /* (currenty two-byte only) padding value for not 32-bit aligned code hunks */
@@ -584,44 +584,92 @@ static void reloc_hunk(FILE *f,uint32_t type,int shrt,struct list *reloclist)
 }
 
 
-static void add_linedebug(struct list *ldblist,uint32_t line,uint32_t off)
+static void add_linedebug(struct list *ldblist,source *src,int line,
+                          uint32_t off)
 {
-  struct hunkline *ldebug = mymalloc(sizeof(struct hunkline));
-
-  ldebug->line = line;
-  ldebug->offset = off;
-  addtail(ldblist,&ldebug->n);
+  char pathbuf[MAXPATHLEN];
+  struct linedb_block *ldbblk;
+  struct linedb_entry *ldbent;
+
+  /* get full source path and fix line number for macros and repetitions */
+  if (src != NULL) {
+    if (src->defsrc != NULL) {
+      line += src->defline;
+      src = src->defsrc;
+    }
+    pathbuf[0] = '\0';
+    if (src->srcfile->incpath != NULL) {
+      if (src->srcfile->incpath->compdir_based)
+        strcpy(pathbuf,compile_dir);
+      strcat(pathbuf,src->srcfile->incpath->path);
+    }
+    strcat(pathbuf,src->srcfile->name);
+  }
+  else  /* line numbers and source defined by directive */
+    strcpy(pathbuf,getdebugname());
+
+  /* make a new LINE debug block whenever the source path changes */
+  if (ldblist->first->next==NULL
+      || filenamecmp(pathbuf,
+                     ((struct linedb_block *)ldblist->last)->filename)) {
+    ldbblk = mymalloc(sizeof(struct linedb_block));
+    ldbblk->filename = mystrdup(pathbuf);
+    ldbblk->offset = off;
+    ldbblk->entries = 0;
+    initlist(&ldbblk->lines);
+    addtail(ldblist,&ldbblk->n);
+  }
+  else
+    ldbblk = (struct linedb_block *)ldblist->last;
+
+  /* append line/offset pair as a new entry for the debug block */
+  ldbent = mymalloc(sizeof(struct linedb_entry));
+  ldbent->line = (uint32_t)line;
+  ldbent->offset = off - ldbblk->offset;
+  addtail(&ldbblk->lines,&ldbent->n);
+  ldbblk->entries++;
 }
 
 
-static void linedebug_hunk(FILE *f,struct list *ldblist,int num)
+static void linedebug_hunk(FILE *f,struct list *ldblist)
 {
-  if (num > 0) {
-    char pathbuf[MAXPATHLEN];
-    uint32_t srcname_len;
-    struct hunkline *hl;
+  struct linedb_block *ldbblk;
+
+  while (ldbblk = (struct linedb_block *)remhead(ldblist)) {
+    char abspathbuf[MAXPATHLEN];
+    struct linedb_entry *ldbent;
+    uint32_t abspathlen;
 
-    if (!abs_path(getdebugname())) {
+    /* get source file name as full absolute path */
+    if (!abs_path(ldbblk->filename)) {
       char *cwd = append_path_delimiter(get_workdir());
-      snprintf(pathbuf,MAXPATHLEN,"%s%s",cwd,getdebugname());
+      snprintf(abspathbuf,MAXPATHLEN,"%s%s",cwd,ldbblk->filename);
       myfree(cwd);
     }
     else
-      strcpy(pathbuf,getdebugname());
-    srcname_len = strlen32(pathbuf);
+      strcpy(abspathbuf,ldbblk->filename);
+    abspathlen = strlen32(abspathbuf);
 
+    /* write DEBUG-LINE hunk header */
     fw32(f,HUNK_DEBUG,1);
-    fw32(f,srcname_len + num*2 + 3,1);
-    fw32(f,0,1);
+    fw32(f,abspathlen + ldbblk->entries*2 + 3,1);
+    fw32(f,ldbblk->offset,1);
     fw32(f,0x4c494e45,1);  /* "LINE" */
-    fw32(f,srcname_len,1);
-    fwname(f,pathbuf);
-
-    for (hl=(struct hunkline *)ldblist->first;
-         hl->n.next; hl=(struct hunkline *)hl->n.next) {
-      fw32(f,hl->line,1);
-      fw32(f,hl->offset,1);
+    fw32(f,abspathlen,1);
+    fwname(f,abspathbuf);
+
+    /* writes and deallocate entries */
+    while (ldbent = (struct linedb_entry *)remhead(&ldbblk->lines)) {
+      fw32(f,ldbent->line,1);
+      fw32(f,ldbent->offset,1);
+      myfree(ldbent);
+      ldbblk->entries--;
     }
+
+    /* deallocate debug block */
+    if (ldbblk->entries != 0)
+      ierror(0);  /* shouldn't happen */
+    myfree(ldbblk);
   }
 }
 
@@ -733,7 +781,6 @@ static void write_object(FILE *f,section *sec,symbol *sym)
         uint32_t type;
         atom *a;
         struct list reloclist,xreflist,linedblist;
-        int num_linedb = 0;
 
         wrotesec = 1;
         initlist(&reloclist);
@@ -764,21 +811,16 @@ static void write_object(FILE *f,section *sec,symbol *sym)
 
             npc = fwpcalign(f,a,sec,pc);
 
-            if (genlinedebug && (a->type==DATA || a->type==SPACE)) {
-              add_linedebug(&linedblist,(uint32_t)a->line,npc);
-              ++num_linedb;
-            }
+            if (genlinedebug && (a->type==DATA || a->type==SPACE))
+              add_linedebug(&linedblist,a->src,a->line,npc);
 
-            if (a->type == DATA) {
+            if (a->type == DATA)
               fwdata(f,a->content.db->data,a->content.db->size);
-            }
-            else if (a->type == SPACE) {
+            else if (a->type == SPACE)
               fwsblock(f,a->content.sb);
-            }
-            else if (a->type == LINE && !genlinedebug) {
-              add_linedebug(&linedblist,(uint32_t)a->content.srcline,npc);
-              ++num_linedb;
-            }
+            else if (a->type == LINE && !genlinedebug)
+              add_linedebug(&linedblist,NULL,a->content.srcline,npc);
+
             process_relocs(a,&reloclist,&xreflist,sec,npc);
 
             pc = npc + atom_size(a,sec,npc);
@@ -811,7 +853,7 @@ static void write_object(FILE *f,section *sec,symbol *sym)
           if (!hunk_onlyglobal)
             ext_defs(f,LABSYM,0,sec->idx,EXT_SYMB);
           /* line-debug */
-          linedebug_hunk(f,&linedblist,num_linedb);
+          linedebug_hunk(f,&linedblist);
         }
         fw32(f,HUNK_END,1);
       }
@@ -857,7 +899,6 @@ static void write_exec(FILE *f,section *sec,symbol *sym)
       	uint32_t type;
         atom *a;
         struct list reloclist,linedblist;
-        int num_linedb = 0;
 
         initlist(&reloclist);
         initlist(&linedblist);
@@ -880,21 +921,16 @@ static void write_exec(FILE *f,section *sec,symbol *sym)
 
             npc = fwpcalign(f,a,sec,pc);
 
-            if (genlinedebug && (a->type==DATA || a->type==SPACE)) {
-              add_linedebug(&linedblist,(uint32_t)a->line,npc);
-              ++num_linedb;
-            }
+            if (genlinedebug && (a->type==DATA || a->type==SPACE))
+              add_linedebug(&linedblist,a->src,a->line,npc);
 
-            if (a->type == DATA) {
+            if (a->type == DATA)
               fwdata(f,a->content.db->data,a->content.db->size);
-            }
-            else if (a->type == SPACE) {
+            else if (a->type == SPACE)
               fwsblock(f,a->content.sb);
-            }
-            else if (a->type == LINE && !genlinedebug) {
-              add_linedebug(&linedblist,(uint32_t)a->content.srcline,npc);
-              ++num_linedb;
-            }
+            else if (a->type == LINE && !genlinedebug)
+              add_linedebug(&linedblist,NULL,a->content.srcline,npc);
+
             process_relocs(a,&reloclist,NULL,sec,npc);
 
             pc = npc + atom_size(a,sec,npc);
@@ -919,7 +955,7 @@ static void write_exec(FILE *f,section *sec,symbol *sym)
           if (!hunk_onlyglobal)
             ext_defs(f,LABSYM,0,sec->idx,EXT_SYMB);
           /* line-debug */
-          linedebug_hunk(f,&linedblist,num_linedb);
+          linedebug_hunk(f,&linedblist);
         }
         fw32(f,HUNK_END,1);
       }
diff --git a/output_hunk.h b/output_hunk.h
index 8f28669..7da89d0 100644
--- a/output_hunk.h
+++ b/output_hunk.h
@@ -20,10 +20,16 @@ struct hunkxref {
 };
 
 /* line debug hunk */
-struct hunkline {
+struct linedb_block {
+  struct node n;
+  char *filename;
+  uint32_t offset;
+  int entries;
+  struct list lines;
+};
+struct linedb_entry {
   struct node n;
   uint32_t line;
-
   uint32_t offset;
 };
 
diff --git a/syntax/mot/syntax.c b/syntax/mot/syntax.c
index ecfe994..1f5888e 100644
--- a/syntax/mot/syntax.c
+++ b/syntax/mot/syntax.c
@@ -12,7 +12,7 @@
    be provided by the main module.
 */
 
-char *syntax_copyright="vasm motorola syntax module 3.12d (c) 2002-2019 Frank Wille";
+char *syntax_copyright="vasm motorola syntax module 3.13 (c) 2002-2019 Frank Wille";
 hashtable *dirhash;
 char commentchar = ';';
 
@@ -1242,9 +1242,9 @@ static void handle_ifmacrond(char *s)
   ifmacro(s,0);
 }
 
-static void ifexp(char *s,int c)
+static int eval_ifexp_advance(char **s,int c)
 {
-  expr *condexp = parse_expr_tmplab(&s);
+  expr *condexp = parse_expr_tmplab(s);
   taddr val;
   int b;
 
@@ -1263,8 +1263,51 @@ static void ifexp(char *s,int c)
     general_error(30);  /* expression must be constant */
     b = 0;
   }
-  cond_if(b);
   free_expr(condexp);
+  return b;
+}
+
+static int eval_ifexp(char *s,int c)
+{
+  return eval_ifexp_advance(&s,c);
+}
+
+static void ifexp(char *s,int c)
+{
+  cond_if(eval_ifexp(s,c));
+}
+
+/* Move line_ptr to the end of the string if the parsing should stop,
+   otherwise move line_ptr after the iif directive and the expression
+   so the parsing can continue and return the new line_ptr.
+   The string is never modified. */
+static char *handle_iif(char *line_ptr)
+{
+  if (strnicmp(line_ptr,"iif",3) == 0 &&
+      isspace((unsigned char)line_ptr[3])) {
+    line_ptr += 3;
+
+    /* Move the line ptr to the beginning of the iif expression. */
+    line_ptr = skip(line_ptr);
+
+    /* As eval_ifexp_advance() may modify the input string, duplicate
+       it for the case when the parsing should continue. */
+    char *expr_copy = mystrdup(line_ptr);
+    char *expr_end = expr_copy;
+    const int condition = eval_ifexp_advance(&expr_end,1);
+    size_t expr_len = expr_end - expr_copy;
+    myfree(expr_copy);
+
+    if (condition) {
+      /* Parsing should continue after the expression, from the next field. */
+      line_ptr += expr_len;
+      line_ptr = skip(line_ptr);
+    } else {
+      /* Parsing should stop, move ptr to the end of the line. */
+      line_ptr += strlen(line_ptr);
+    }
+  }
+  return line_ptr;
 }
 
 static void handle_ifeq(char *s)
@@ -1749,9 +1792,8 @@ static int check_directive(char **line)
   return data.idx;
 }
 
-
-/* Handles assembly directives; returns non-zero if the line
-   was a directive. */
+/* Handles assembly directives;
+   returns non-zero if the parsing of the line should stop. */
 static int handle_directive(char *line)
 {
   int idx = check_directive(&line);
@@ -1980,7 +2022,11 @@ void parse(void)
         symflags |= EXPORT;
         s++;
       }
+
       s = skip(s);
+
+      s = handle_iif(s);
+
       if (!strnicmp(s,"equ",3) && isspace((unsigned char)*(s+3))) {
         s = skip(s+3);
         label = new_equate(labname,parse_expr_tmplab(&s));
@@ -2048,6 +2094,8 @@ void parse(void)
     if (*s=='\0' || *s=='*' || *s==commentchar)
       continue;
 
+    s = handle_iif(s);
+
     s = parse_cpu_special(s);
     if (ISEOL(s))
       continue;
@@ -2518,7 +2566,6 @@ int syntax_args(char *p)
     align_data = 1;
     esc_sequences = 0;
     allmp = 1;
-    dot_idchar = 1;
     warn_unalloc_ini_dat = 1;
     return 1;
   }
@@ -2528,6 +2575,7 @@ int syntax_args(char *p)
     esc_sequences = 1;
     nocase_macros = 1;
     allow_spaces = 1;
+    dot_idchar = 1;
     allmp = 1;
     return 1;
   }
diff --git a/vasm.c b/vasm.c
index d566b27..26ae302 100644
--- a/vasm.c
+++ b/vasm.c
@@ -10,7 +10,7 @@
 #include "stabs.h"
 #include "dwarf.h"
 
-#define _VER "vasm 1.8f"
+#define _VER "vasm 1.8g"
 char *copyright = _VER " (c) in 2002-2019 Volker Barthelmann";
 #ifdef AMIGA
 static const char *_ver = "$VER: " _VER " " __AMIGADATE__ "\r\n";
@@ -30,11 +30,11 @@ static const char *_ver = "$VER: " _VER " " __AMIGADATE__ "\r\n";
 source *cur_src;
 char *filename,*debug_filename;
 section *current_section;
-char *inname,*outname,*listname;
+char *inname,*outname,*listname,*compile_dir;
 taddr inst_alignment;
 int done,secname_attr,unnamed_sections,ignore_multinc,nocase,no_symbols;
 int pic_check,final_pass,debug,exec_out,chklabels,warn_unalloc_ini_dat;
-int dwarf;
+int nostdout;
 int listena,listformfeed=1,listlinesperpage=40,listnosyms;
 listing *first_listing,*last_listing,*cur_listing;
 struct stabdef *first_nlist,*last_nlist;
@@ -49,7 +49,6 @@ static char **listtitles;
 static int *listtitlelines;
 static int listtitlecnt;
 
-static char *compile_dir;
 static FILE *outfile;
 
 static int depend,depend_all;
@@ -60,6 +59,7 @@ struct deplist {
   char *filename;
 };
 static struct deplist *first_depend,*last_depend;
+static char *dep_filename;
 
 static section *first_section,*last_section;
 #if NOT_NEEDED
@@ -72,6 +72,7 @@ static section *prev_sec,*prev_org;
 #endif
 hashtable *mnemohash;
 
+static int dwarf;
 static int verbose=1,auto_import=1;
 static int fail_on_warning;
 static struct include_path *first_incpath;
@@ -86,10 +87,10 @@ void leave(void)
 {
   section *sec;
   symbol *sym;
-  
+
   if(outfile){
     fclose(outfile);
-    if (errors)
+    if (errors&&outname!=NULL)
       remove(outname);
   }
 
@@ -291,7 +292,7 @@ static void assemble(void)
   if(dwarf){
     dinfo.version=dwarf;
     dinfo.producer=cnvstr(copyright,strchr(copyright,'(')-copyright-1);
-    dwarf_init(&dinfo,compile_dir,first_incpath,first_source);
+    dwarf_init(&dinfo,first_incpath,first_source);
   }
   final_pass=1;
   rorg=0;
@@ -397,9 +398,9 @@ static void assemble(void)
       else if(p->type==OPTS)
         cpu_opts(p->content.opts);
 #endif
-      else if(p->type==PRINTTEXT&&!depend)
+      else if(p->type==PRINTTEXT&&!nostdout)
         printf("%s",p->content.ptext);
-      else if(p->type==PRINTEXPR&&!depend)
+      else if(p->type==PRINTEXPR&&!nostdout)
         atom_printexpr(p->content.pexpr,sec,sec->pc);
       else if(p->type==ASSERT){
         assertion *ast=p->content.assert;
@@ -511,13 +512,13 @@ static int init_output(char *fmt)
   if(!strcmp(fmt,"test"))
     return init_output_test(&output_copyright,&write_object,&output_args);
   if(!strcmp(fmt,"elf"))
-    return init_output_elf(&output_copyright,&write_object,&output_args);  
+    return init_output_elf(&output_copyright,&write_object,&output_args);
   if(!strcmp(fmt,"bin"))
     return init_output_bin(&output_copyright,&write_object,&output_args);
   if(!strcmp(fmt,"srec"))
     return init_output_srec(&output_copyright,&write_object,&output_args);
   if(!strcmp(fmt,"vobj"))
-    return init_output_vobj(&output_copyright,&write_object,&output_args);  
+    return init_output_vobj(&output_copyright,&write_object,&output_args);
   if(!strcmp(fmt,"hunk"))
     return init_output_hunk(&output_copyright,&write_object,&output_args);
   if(!strcmp(fmt,"aout"))
@@ -655,13 +656,13 @@ int main(int argc,char **argv)
     }
     if(!strcmp("-o",argv[i])&&i<argc-1){
       if(outname)
-        general_error(28,'o');
+        general_error(28,argv[i]);
       outname=argv[++i];
       continue;
     }
     if(!strcmp("-L",argv[i])&&i<argc-1){
       if(listname)
-        general_error(28,'L');
+        general_error(28,argv[i]);
       listname=argv[++i];
       produce_listing=1;
       set_listing(1);
@@ -729,6 +730,12 @@ int main(int argc,char **argv)
         continue;
       }
     }
+    if(!strcmp("-depfile",argv[i])&&i<argc-1){
+      if(dep_filename)
+        general_error(28,argv[i]);
+      dep_filename=argv[++i];
+      continue;
+    }
     if(!strcmp("-unnamed-sections",argv[i])){
       unnamed_sections=1;
       continue;
@@ -810,6 +817,7 @@ int main(int argc,char **argv)
     }
     general_error(14,argv[i]);
   }
+  nostdout=depend&&dep_filename==NULL; /* dependencies to stdout nothing else */
   include_main_source();
   internal_abs(vasmsym_name);
   if(!init_parse())
@@ -834,9 +842,23 @@ int main(int argc,char **argv)
     write_listing(listname);
   }
   if(errors==0){
-    if(!depend){
+    if(depend&&dep_filename==NULL){
+      /* dependencies to stdout, no object output */
+      write_depends(stdout);
+    } else {
       if(verbose)
         statistics();
+      if(depend&&dep_filename!=NULL){
+        /* write dependencies to a named file first */
+        FILE *depfile = fopen(dep_filename,"w");
+        if (depfile){
+          write_depends(depfile);
+          fclose(depfile);
+        }
+        else
+          general_error(13,dep_filename);
+      }
+      /* write the object file */
       if(!outname)
         outname="a.out";
       outfile=fopen(outname,"wb");
@@ -844,8 +866,7 @@ int main(int argc,char **argv)
         general_error(13,outname);
       else
         write_object(outfile,first_section,first_symbol);
-    }else
-      write_depends(stdout);
+    }
   }
   leave();
   return 0; /* not reached */
@@ -1341,7 +1362,7 @@ static void print_list_header(FILE *f,int cnt)
       cnt++;
     }
     fprintf(f,"Err  Line Loc.  S Object1  Object2  M Source\n");
-  }  
+  }
 }
 
 #if VASM_CPU_OIL
@@ -1406,7 +1427,7 @@ void write_listing(char *listname)
       fprintf(f,"%c ",rel);
     }else
       fprintf(f,"                           ");
-    
+
     fprintf(f," %-.77s",p->txt);
 
     /* bei laengeren Daten den Rest ueberspringen */
@@ -1459,7 +1480,7 @@ void write_listing(char *listname)
           else
             rel='0'+p->sec->idx;
         }else
-          rel='A';      
+          rel='A';
       }else
         a=0;
     }
diff --git a/vasm.h b/vasm.h
index 007c2b0..d09338d 100644
--- a/vasm.h
+++ b/vasm.h
@@ -174,7 +174,7 @@ struct listing {
 
 
 extern listing *first_listing,*last_listing,*cur_listing;
-extern int done,final_pass;
+extern int done,final_pass,nostdout;
 extern int warn_unalloc_ini_dat;
 extern int listena,listformfeed,listlinesperpage,listnosyms;
 extern int mnemonic_cnt;
@@ -185,7 +185,7 @@ extern source *cur_src;
 extern section *current_section;
 extern char *filename;
 extern char *debug_filename;  /* usually an absolute C source file name */
-extern char *inname,*outname,*listname;
+extern char *inname,*outname,*listname,*compile_dir;
 extern char *output_format;
 extern char emptystr[];
 extern char vasmsym_name[];