Merge branch 'osfree-project:master' into master

osfree-project · Jul 3, 2022 · 461fe12 · 461fe12
2 parents d9c714b + 66e8982
commit 461fe12
Show file tree

Hide file tree

Showing 32 changed files with 126 additions and 68 deletions.
diff --git a/OS2/CMD/lvm/contrib/Drive_Linking.c b/OS2/CMD/lvm/contrib/Drive_Linking.c
@@ -5343,7 +5343,7 @@ void _System Get_Required_LVM_Version( CARDINAL32 * Major_Version_Number, CARDIN
 #define MAX_HELP_MESSAGE_SIZE           (1024 * 12)
 #define DRIVE_LINKING_HELP_MESSAGE      5026
 
-uint _System DosGetMessage ( char **, uint, char *, uint, uint, char *, uint *);
+//uint _System DosGetMessage ( char **, uint, char *, uint, uint, char *, uint *);
 char *help_message=NULL;
 #ifdef __DLL__ 
 char chars_less_than_greater_than[2] = {'<', '>'};

diff --git a/OS2/CMD/lvm/contrib/disk.c b/OS2/CMD/lvm/contrib/disk.c
@@ -1927,7 +1927,7 @@ ConstructDiskPanels ( uint  top_row,
     Disk_panel.box.border_attribute = Panel_border_attribute;
     Disk_panel.text_line = Disk_panel_text;
     Disk_panel.callback = disk_panel_callback;
-    Disk_panel.help.routine = DoHelpPanel;
+    Disk_panel.help.routine = (void *)DoHelpPanel;
     Disk_panel.help.default_message = DISK_HELP_MESSAGE;
 
     /* Disk_options_menu */
@@ -1939,7 +1939,7 @@ ConstructDiskPanels ( uint  top_row,
     Disk_options_menu.box.attribute = Menu_attribute;
     Disk_options_menu.box.border_attribute = Menu_border_attribute;
     Disk_options_menu.text_line = Disk_options_text;
-    Disk_options_menu.help.routine = DoHelpPanel;
+    Disk_options_menu.help.routine = (void *)DoHelpPanel;
     Disk_options_menu.help.array = Disk_options_help_array;
     Disk_options_menu.help.array_size = Disk_options_help_array_size;
 
@@ -1997,7 +1997,7 @@ ConstructDiskPanels ( uint  top_row,
     Partition_panel.box.attribute = Panel_attribute;
     Partition_panel.box.border_attribute = Panel_border_attribute;
     Partition_panel.text_line = Partition_panel_text [ 0 ];
-    Partition_panel.help.routine = DoHelpPanel;
+    Partition_panel.help.routine = (void *)DoHelpPanel;
     Partition_panel.help.default_message = DISK_HELP_MESSAGE;
 
     /* Partition_options_menu */

diff --git a/OS2/CMD/lvm/contrib/engine.c b/OS2/CMD/lvm/contrib/engine.c
@@ -569,7 +569,7 @@ void _System Open_LVM_Engine2( BOOLEAN Ignore_CHS, LVM_Interface_Types Interface
   {
 
     /* Install the exit procedure which enables PRM Rediscovery. */
-    DosExitList(EXLST_ADD, &Exit_Procedure);
+    DosExitList(EXLST_ADD, (void *)&Exit_Procedure);
 
     /* Now disable PRM Rediscovery while the engine is running. */
     PRM_Rediscovery_Control(FALSE);

diff --git a/OS2/CMD/lvm/contrib/menu.c b/OS2/CMD/lvm/contrib/menu.c
@@ -187,7 +187,7 @@ UserDefinedMenuPanel ( register panel_t  *panel,
     uint    *action;
     char    **line = panel->text_line;
     //uint    (* _System callback) (panel_t *panel) = panel->callback;
-    uint    _System (* callback) (panel_t *panel) = panel->callback;
+    uint    _System (* callback) (panel_t *panel) = (void *)panel->callback;
     bool    finished = FALSE;
     uint    grayed_attribute, normal_attribute;
 
@@ -310,7 +310,7 @@ ScrollingMenuPanel ( register
             **bottom_line;
     bool    finished = FALSE;
     //uint    (* _System callback) (panel_t *panel) = panel->callback;
-    uint    _System (* callback) (panel_t *panel) = panel->callback;
+    uint    _System (* callback) (panel_t *panel) = (void *)panel->callback;
 
     if ( panel->control & INITIALIZE_PANEL ) {
         panel->control &= ~INITIALIZE_PANEL;

diff --git a/OS2/CMD/lvm/contrib/volume.c b/OS2/CMD/lvm/contrib/volume.c
@@ -2329,7 +2329,7 @@ ConstructVolumePanels ( uint  top_row,
     Volume_panel.box.border_attribute = Panel_border_attribute;
     Volume_panel.text_line = Volume_panel_text;
     Volume_panel.callback = volume_panel_callback;
-    Volume_panel.help.routine = DoHelpPanel;
+    Volume_panel.help.routine = (void *)DoHelpPanel;
     Volume_panel.help.default_message = VOLUME_HELP_MESSAGE;
 
     /* Volume_options_menu */
@@ -2341,7 +2341,7 @@ ConstructVolumePanels ( uint  top_row,
     Volume_options_menu.box.attribute = Menu_attribute;
     Volume_options_menu.box.border_attribute = Menu_border_attribute;
     Volume_options_menu.text_line = Volume_options_text2;
-    Volume_options_menu.help.routine = DoHelpPanel;
+    Volume_options_menu.help.routine = (void *)DoHelpPanel;
     Volume_options_menu.help.array = Volume_options_help_array;
     Volume_options_menu.help.array_size = Volume_options_help_array_size;
 
@@ -2374,7 +2374,7 @@ ConstructVolumePanels ( uint  top_row,
     Bootable_panel.box.attribute = Choice_attribute;
     Bootable_panel.box.border_attribute = Choice_border_attribute;
     Bootable_panel.text_line = Bootable_text;
-    Bootable_panel.help.routine = DoHelpPanel;
+    Bootable_panel.help.routine = (void *)DoHelpPanel;
     Bootable_panel.help.array = Bootable_help_array;
     Bootable_panel.help.array_size = Bootable_help_array_size;
 
@@ -2401,7 +2401,7 @@ ConstructVolumePanels ( uint  top_row,
     Drive_letter_panel.box.attribute = Choice_attribute;
     Drive_letter_panel.box.border_attribute = Choice_border_attribute;
     Drive_letter_panel.text_line = Drive_letter_text;
-    Drive_letter_panel.help.routine = DoHelpPanel;
+    Drive_letter_panel.help.routine = (void *)DoHelpPanel;
     Drive_letter_panel.help.default_message = DRIVE_LETTER_HELP_MESSAGE;
 
     /* Volume_name_panel */
@@ -2455,7 +2455,7 @@ ConstructVolumePanels ( uint  top_row,
     Partitions_panel.box.attribute = Panel_attribute;
     Partitions_panel.box.border_attribute = Panel_border_attribute;
     Partitions_panel.text_line = Empty_text;
-    Partitions_panel.help.routine = DoHelpPanel;
+    Partitions_panel.help.routine = (void *)DoHelpPanel;
     Partitions_panel.help.default_message = VOLUME_HELP_MESSAGE;
 
     /* Partitions_options_menu */
@@ -2478,7 +2478,7 @@ ConstructVolumePanels ( uint  top_row,
     Volume_select_feature_menu.box.border_attribute = Menu_border_attribute;
     Volume_select_feature_menu.title_line = Volume_select_feature_title;
     Volume_select_feature_menu.text_line = Volume_feature_text;
-    Volume_select_feature_menu.help.routine = DoHelpPanel;
+    Volume_select_feature_menu.help.routine = (void *)DoHelpPanel;
     Volume_select_feature_menu.help.default_message = SELECT_FEATURES_HELP_MESSAGE;
     Volume_select_feature_menu.callback = Volume_select_feature_callback;
 
@@ -2491,7 +2491,7 @@ ConstructVolumePanels ( uint  top_row,
     Volume_order_feature_menu.box.border_attribute = Menu_border_attribute;
     Volume_order_feature_menu.title_line = Volume_order_feature_title;
     Volume_order_feature_menu.text_line = 0;
-    Volume_order_feature_menu.help.routine = DoHelpPanel;
+    Volume_order_feature_menu.help.routine = (void *)DoHelpPanel;
     Volume_order_feature_menu.help.default_message = ORDER_FEATURES_HELP_MESSAGE;
     Volume_order_feature_menu.callback = Volume_order_feature_callback;
 
@@ -2522,7 +2522,7 @@ ConstructVolumePanels ( uint  top_row,
     Volume_aggregates_panel.box.border_attribute = Panel_border_attribute;
     Volume_aggregates_panel.text_line = Volume_aggregates_panel_text;
     Volume_aggregates_panel.callback = volume_aggregates_panel_callback;
-    Volume_aggregates_panel.help.routine = DoHelpPanel;
+    Volume_aggregates_panel.help.routine = (void *)DoHelpPanel;
     Volume_aggregates_panel.help.default_message = NAVIGATE_FEATURES_HELP_MESSAGE;
 
 
@@ -2554,7 +2554,7 @@ ConstructVolumePanels ( uint  top_row,
     Aggregate_features_panel.box.attribute = Panel_attribute;
     Aggregate_features_panel.box.border_attribute = Panel_border_attribute;
     Aggregate_features_panel.text_line = Empty_text;
-    Aggregate_features_panel.help.routine = DoHelpPanel;
+    Aggregate_features_panel.help.routine = (void *)DoHelpPanel;
     Aggregate_features_panel.help.default_message = NAVIGATE_FEATURES_HELP_MESSAGE;
 
     /* Aggregate_feature_options_menu */
@@ -2566,7 +2566,7 @@ ConstructVolumePanels ( uint  top_row,
     Aggregate_feature_options_menu.box.attribute = Menu_attribute;
     Aggregate_feature_options_menu.box.border_attribute = Menu_border_attribute;
     Aggregate_feature_options_menu.text_line = Aggregate_feature_options_text;
-    Aggregate_feature_options_menu.help.routine = DoHelpPanel;
+    Aggregate_feature_options_menu.help.routine = (void *)DoHelpPanel;
     Aggregate_feature_options_menu.help.default_message = NAVIGATE_FEATURES_HELP_MESSAGE;
 
 

diff --git a/OS2/CMD/lvm/makefile b/OS2/CMD/lvm/makefile
@@ -28,10 +28,10 @@ $(p)volume$(e) &
 $(p)menu$(e) &
 $(p)Volume_Manager$(e)
 
-ADD_COPT = -ecs -dNDEBUG -i=$(MYDIR)contrib$(SEP)include
-ADD_LINKOPT = lib clib3r
-
-#UNI2H = 1
+ADD_COPT = -dNDEBUG -i=$(MYDIR)contrib$(SEP)include -3s # -ecs
+#ADD_LINKOPT = lib clib3r
+#UNI2H  = 1
+C      = s
 
 !include $(%ROOT)/mk/appsos2_cmd.mk
 

diff --git a/OS2/REXX/cmd/pmrexx/makefile b/OS2/REXX/cmd/pmrexx/makefile
@@ -5,14 +5,15 @@ DESC = PM REXX console
 DIRS = pmrexxio help
 srcfiles     = $(p)pmrexx$(e) $(p)rxhafile$(e)
 inc          = $(MYDIR)include
-ADD_COPT     = -i=$(inc) -sg -3r # -3s
-#ADD_LINKOPT  = lib os2386.lib,clib3r.lib,math387r.lib,emu387.lib,rexx.lib
+ADD_COPT     = -i=$(inc) -sg -3s # -3r
+ADD_LINKOPT  = lib os2386.lib,clib3s.lib,math387s.lib,emu387.lib,rexx.lib
 OPTIONS      = heapsize=8192
 STACKSIZE    = 16384
 PM           = 1
-IMPORTS      = RexxCreateIOWindow_    PMREXXIO.RexxCreateIOWindow, &
-    	       RexxDestroyIOWindow_   PMREXXIO.RexxDestroyIOWindow
+IMPORTS      = RexxCreateIOWindow    PMREXXIO.RexxCreateIOWindow, &
+    	       RexxDestroyIOWindow   PMREXXIO.RexxDestroyIOWindow
 UNI2H        = 1
+C            = s
 
 !include $(%ROOT)/mk/appsos2.mk
 

diff --git a/OS2/REXX/cmd/pmrexx/pmrexxio/makefile b/OS2/REXX/cmd/pmrexx/pmrexxio/makefile
@@ -5,20 +5,21 @@ TRGT = $(PROJ1).dll
 # TRGT = $(PROJ).dll
 DESC = PM REXX I/O dll
 srcfiles     = $(p)pmrexxio$(e) $(p)pmrxsubs$(e)
-inc          = $(MYDIR)..$(SEP)include -i=$(%WATCOM)$(SEP)h$(SEP)os2 # -i=$(BLD)include -i=$(BLD)include$(SEP)os2 -i=$(BLD)include$(SEP)shared
-ADD_COPT     = -i=$(inc) -sg -3r # -3s
+inc          = $(MYDIR)..$(SEP)include -i=$(%WATCOM)$(SEP)h$(SEP)os2 -i=$(BLD)include -i=$(BLD)include$(SEP)os2 -i=$(BLD)include$(SEP)shared
+ADD_COPT     = -i=$(inc) -sg -3s # -3r
 ADD_RCOPT    = -i=$(inc)
-ADD_LINKOPT  = segment type DATA nonshared lib os2386.lib,clib3r.lib,math387r.lib,emu387.lib,rexx.lib
+ADD_LINKOPT  = segment type DATA nonshared lib os2386.lib,clib3s.lib,math387s.lib,emu387.lib,rexx.lib
 DLL          = 1
 WINDOWCOMPAT = 1
 OPTIONS      = manyautodata, caseexact, heapsize=8192, quiet
 DLLOPT       = initinstance
 STACKSIZE    = 16384
-EXPORTS      = RexxCreateIOWindow.1  = RexxCreateIOWindow_, &
-	       RexxDestroyIOWindow.2 = RexxDestroyIOWindow_
+EXPORTS      = RexxCreateIOWindow.1  = RexxCreateIOWindow, &
+	       RexxDestroyIOWindow.2 = RexxDestroyIOWindow
 # RESOURCE     = $(PATH)$(PROJ).res
 DEST         = os2$(SEP)dll
-# UNI2H        = 1
+UNI2H        = 1
+C            = s
 
 !include $(%ROOT)/mk/appsos2.mk
 

diff --git a/OS2/REXX/interp/regina.mk b/OS2/REXX/interp/regina.mk
@@ -71,16 +71,16 @@ $(PATH)rexxsaa.$(O): $(SRC)rexxsaa.c $(HFILES) $(SRC)rexxsaa.h $(SRC)rxiface.h
 
 $(PATH)yaccsrc.$(O): $(SRC)yaccsrc.c $(SRC)defs.h $(SRC)rexx.h
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -dYYMAXDEPTH=10000 -fr=$^*.err -fo=$^@ $[@ $(LOG)
+ @$(CC) $(COPT) -dYYMAXDEPTH=10000 -fr=$^*.err -fo=$^@ $(SRC)yaccsrc.c $(LOG)
 
 $(PATH)drexx.obj: $(SRC)rexx.c $(HFILES)
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -dRXLIB -fr=$^*.err -fo=$^@ $[@
+ @$(CC) $(COPT) -dRXLIB -fr=$^*.err -fo=$^@ $(SRC)rexx.c
 
-$(PATH)eextstack.obj:  $(SRC)extstack.c $(HFILES)
+$(PATH)eextstack.obj: $(SRC)extstack.c $(HFILES)
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $[@
+ @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $(SRC)extstack.c
 
-$(PATH)erexxbif.obj:  $(SRC)rexxbif.c $(HFILES)
+$(PATH)erexxbif.obj: $(SRC)rexxbif.c $(HFILES)
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $[@
+ @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $(SRC)rexxbif.c
diff --git a/OS2/REXX/interp/rxqueue/makefile b/OS2/REXX/interp/rxqueue/makefile
@@ -17,10 +17,10 @@ ADD_LINKOPT = lib $(BLD)lib$(SEP)rexx.lib,tcpip32.lib
 !include $(%ROOT)mk/dirs.mk
 !include $(MYDIR)..$(SEP)regina.mk
 
-$(PATH)rxqueue.obj:  $(SRC)rxqueue.c $(HFILES)
+$(PATH)rxqueue.obj: $(SRC)rxqueue.c $(HFILES)
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $[@
+ @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $(SRC)rxqueue.c
 
-#$(PATH)rexxbif.obj:  $(SRC)rexxbif.c $(HFILES)
+#$(PATH)rexxbif.obj: $(SRC)rexxbif.c $(HFILES)
 # @$(SAY) CC       $^. $(LOG)
-# @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $[@
+# @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $(SRC)rexxbif.c
diff --git a/OS2/REXX/interp/rxstack/makefile b/OS2/REXX/interp/rxstack/makefile
@@ -19,10 +19,10 @@ ADD_LINKOPT = lib $(BLD)lib$(SEP)rexx.lib,tcpip32.lib
 !include $(%ROOT)mk/dirs.mk
 !include $(MYDIR)..$(SEP)regina.mk
 
-$(PATH)rxstack.obj:  $(SRC)rxstack.c $(HFILES)
+$(PATH)rxstack.obj: $(SRC)rxstack.c $(HFILES)
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $[@
+ @$(CC) $(COPT) -dEXTERNAL_TO_REGINA  -fr=$^*.err -fo=$^@ $(SRC)rxstack.c
 
-$(PATH)LibSha1.obj:  $(SRC)contrib$(SEP)LibSha1.c $(SRC)contrib$(SEP)LibSha1.h
+$(PATH)LibSha1.obj: $(SRC)contrib$(SEP)LibSha1.c $(SRC)contrib$(SEP)LibSha1.h
  @$(SAY) CC       $^. $(LOG)
- @$(CC) $(COPT) -fr=$^*.err -fo=$^@ $[@
+ @$(CC) $(COPT) -fr=$^*.err -fo=$^@ $(SRC)contrib$(SEP)LibSha1.c
diff --git a/OS2/REXX/libs/rexxutil/makefile b/OS2/REXX/libs/rexxutil/makefile
@@ -11,15 +11,16 @@ OPT         = -d0 -oteanx
 PROJ        = rexxutil
 TRGT        = $(PROJ).dll
 DESC        = REXX Utilities API
-# UNI2H       = 1
+UNI2H       = 1
 # NOLIBS      = 0
 C = s
-ADD_COPT    = -i=$(MYDIR) -bm -wx -s -mf $(OPT) -6r -fp6 -6s
+ADD_COPT    = -i=$(MYDIR) -bm -wx -s -mf $(OPT) -fp6 -6s # -6r
 # ADD_COPT    = -i=$(MYDIR) -i=..$(SEP)..$(SEP)..$(SEP)CMD$(SEP)include -bm -wx -s -mf $(OPT) -fp6 -6s
 DLL         = 1
 DLLOPT      = initinstance terminstance
 OPTIONS     = manyautodata
 STACKSIZE   = 0x20000
+C = s
 
 srcfiles    = $(p)rexxfuncs$(e) $(p)sysfile$(e)     $(p)sysmiscfile$(e) $(p)systextscreen$(e) $(p)sysversion$(e)  &
               $(p)sysdrive$(e)  $(p)syseautil$(e)   $(p)sysobjects$(e)  $(p)sysprocess$(e)    $(p)syslang$(e)     &

diff --git a/OS2/REXX/libs/rxmath/rxmath.mk b/OS2/REXX/libs/rxmath/rxmath.mk
@@ -18,5 +18,6 @@ OPTIONS     = manyautodata
 DLL         = 1
 DLLOPT      = initinstance terminstance
 UNI2H       = 1
+C = s
 
 !include $(%ROOT)/mk/appsos2_cmd.mk
diff --git a/OS2/REXX/libs/rxsock/config.h b/OS2/REXX/libs/rxsock/config.h
@@ -55,7 +55,7 @@
 #define HAVE_GETHOSTID 1
 
 /* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
+#define HAVE_STRERROR 1
 
 /* Define if you have the <ctype.h> header file.  */
 #define HAVE_CTYPE_H 1

diff --git a/OS2/REXX/libs/rxsock/conversions.h b/OS2/REXX/libs/rxsock/conversions.h
@@ -23,7 +23,8 @@
 
 #include "rxpack.h"
 
-#ifdef __OS2__
+#ifdef HAVE_TYPES_H
+#undef _POSIX_SOURCE
 #include <types.h>
 #endif
 

diff --git a/OS2/REXX/libs/rxsock/makefile b/OS2/REXX/libs/rxsock/makefile
@@ -9,13 +9,15 @@ OPT         = -d0 -oteanx
 PROJ        = rxsock
 TRGT        = $(PROJ).dll
 DESC        = REXX Socket interface
-ADD_COPT    = -dDYNAMIC -dHAVE_CONFIG_H -i=$(MYDIR) -bm -wx -s -mf $(OPT) -6r -fp6 # -6s
-ADD_LINKOPT = lib tcpip32.lib #lib libuls.lib, libconv.lib
+ADD_COPT    = -dDYNAMIC -dHAVE_CONFIG_H -i=$(MYDIR) -bm -wx -s -mf $(OPT) -6s -fp6 # -6r
+ADD_LINKOPT = lib tcpip32.lib,rexx.lib #lib libuls.lib, libconv.lib
 DLL         = 1
-# UNI2H       = 1
+NOLIBS      = 1
+#UNI2H       = 1
 DLLOPT      = initinstance terminstance
 OPTIONS     = manyautodata
 STACKSIZE   = 0x20000
+C = s
 
 srcfiles    = $(p)conversions$(e) $(p)getopt$(e) $(p)loader$(e) $(p)rxpack$(e) $(p)rxsock$(e)
 EXPORTS     = &

diff --git a/OS2/REXX/libs/rxsock/rxpack.h b/OS2/REXX/libs/rxsock/rxpack.h
@@ -32,6 +32,7 @@
 #endif
 
 #ifdef HAVE_TYPES_H
+#undef _POSIX_SOURCE
 # include <types.h>
 #endif
 
@@ -108,6 +109,9 @@
 #  define INCL_RXSYSEXIT  /* System exit routines */
 #  define INCL_RXSUBCOM   /* Subcommand routines */
 #  include <os2.h>
+#  ifdef __WATCOMC__
+#   include <rexxsaa.h>
+#  endif
 # else
 #  include <os2.h>
 #  define INCL_RXSHV      /* Shared variable support */

diff --git a/OS2/REXX/libs/rxuls/makefile b/OS2/REXX/libs/rxuls/makefile
@@ -9,13 +9,14 @@ OPT         = -d0 -oteanx
 PROJ        = rxuls
 TRGT        = $(PROJ).dll
 DESC        = REXX Universal Language Support functions
-ADD_COPT    = -i=$(MYDIR) -bm -wx -s -mf $(OPT) -6r -fp6 # -6s
+ADD_COPT    = -i=$(MYDIR) -bm -wx -s -mf $(OPT) -6s -fp6 # -6r
 ADD_LINKOPT = lib libuls.lib, libconv.lib
 # UNI2H       = 1
 DLL         = 1
 DLLOPT      = initinstance terminstance
 OPTIONS     = manyautodata
 STACKSIZE   = 0x20000
+C = r
 
 srcfiles    = $(p)rxuls$(e)
 EXPORTS     = &

diff --git a/mk/all.mk b/mk/all.mk
@@ -20,7 +20,6 @@ print_vars: .symbolic
         @echo RELDIR   $(RELDIR)
         @echo PATH     $(PATH) 
         @echo BLD      $(BLD)
-        @echo RELDIR   $(RELDIR)
         @echo TOOLDIR  $(TOOLDIR)
         @echo DEST     $(DEST)
         @echo x        $(x)

diff --git a/mk/appsdos.mk b/mk/appsdos.mk
@@ -30,7 +30,11 @@ TARGETS  = $(PATH)$(PROJ).com # $(PATH)$(PROJ).sym
 TARGETS  = $(PATH)$(PROJ).exe # $(PATH)$(PROJ).sym
 !endif
 
-$(PATH)$(PROJ).lnk: $(OBJS) $(MYDIR)makefile
+!ifdef OBJS
+$(OBJS): $(MYDIR)makefile
+!endif
+
+$(PATH)$(PROJ).lnk: $(OBJS)
  @%create $^@
  @%append $^@ FORMAT dos $(comf)
  @%append $^@ NAME $^*
@@ -50,7 +54,7 @@ $(PATH)$(PROJ).lnk: $(OBJS) $(MYDIR)makefile
  @%append $^@ OPTION MAP=$^*.wmp
  $(ADDFILES_CMD)
 
-$(PATH)$(TRGT): $(PATH)$(PROJ).lnk $(OBJS)
+$(PATH)$(TRGT): $(PATH)$(PROJ).lnk
  @$(SAY) LINK     $^. $(LOG)
  $(verbose)$(LINKER) $(LINKOPT) @$[@ $(LOG2)