2009-07-11 17:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/rules.cf
* config/dos/dir.cf
* config/dos/global.cf
* config/dos/install.cf
* config/none.cf
* config/win/global.cf
* config/win/install.cf
* config/win/dir.cf
* config/win/mingw.cf
* config/os2/dir.cf
* config/os2/global.cf
* config/os2/install.cf
* config/wce/dir.cf
* config/wce/global.cf
* config/wce/mingwarm.cf
* config/wce/install.cf
* Syncing/cleanup effort.
This commit is contained in:
@@ -17,6 +17,25 @@
|
||||
past entries belonging to author(s): Viktor Szakats.
|
||||
*/
|
||||
|
||||
2009-07-11 17:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* config/rules.cf
|
||||
* config/dos/dir.cf
|
||||
* config/dos/global.cf
|
||||
* config/dos/install.cf
|
||||
* config/none.cf
|
||||
* config/win/global.cf
|
||||
* config/win/install.cf
|
||||
* config/win/dir.cf
|
||||
* config/win/mingw.cf
|
||||
* config/os2/dir.cf
|
||||
* config/os2/global.cf
|
||||
* config/os2/install.cf
|
||||
* config/wce/dir.cf
|
||||
* config/wce/global.cf
|
||||
* config/wce/mingwarm.cf
|
||||
* config/wce/install.cf
|
||||
* Syncing/cleanup effort.
|
||||
|
||||
2009-07-11 17:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
|
||||
* harbour/config/dos/watcom.cf
|
||||
* harbour/config/win/watcom.cf
|
||||
|
||||
@@ -10,7 +10,7 @@ DIR_RULE = @echo Done
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(SHLVL),) # COMMAND.COM
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
# We have to use script to overcome the DOS limit of max 128 characters
|
||||
# NOTE: The empty line directly before 'endef' HAVE TO exist!
|
||||
@@ -33,7 +33,7 @@ DIR_RULE =\
|
||||
fi \
|
||||
done
|
||||
|
||||
endif # ! COMMAND.COM
|
||||
endif # ! non-bash
|
||||
|
||||
endif # ! Empty directory list
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ HB_GT_LIST=\
|
||||
#HB_GT_LIBS := $(foreach gt, $(HB_GT_LIST), $(if $(wildcard $(TOP)$(ROOT)source/rtl/$(gt)),$(gt),))
|
||||
HB_GT_LIBS := $(HB_GT_LIST)
|
||||
|
||||
ifeq ($(SHLVL),) # COMMAND.COM
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
# There is a conflict with the use of '\' and '/' characters
|
||||
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
|
||||
|
||||
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(SHLVL),) # COMMAND.COM
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
# We have to use script to overcome the DOS limit of max 128 characters
|
||||
# NOTE: The empty line directly before 'endef' HAVE TO exist!
|
||||
|
||||
@@ -10,7 +10,7 @@ ifneq ($(ComSpec),)
|
||||
endif
|
||||
|
||||
CMDPREF:=
|
||||
ifeq ($(SHLVL),)
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
ifneq ($(COMSPEC),)
|
||||
CMDPREF := $(COMSPEC) /C
|
||||
endif
|
||||
|
||||
@@ -10,7 +10,7 @@ DIR_RULE = @echo Done
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(SHLVL),) # An OS/2 command shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
DIR_MAKE = $(subst /,\,$(MK))
|
||||
DIR_LIST = $(subst /,\,$(DIRS))
|
||||
@@ -20,12 +20,12 @@ else # bash
|
||||
|
||||
DIR_RULE =\
|
||||
@for d in $(DIRS); do \
|
||||
if [ -d $$d ]; then \
|
||||
$(MAKE) -C $$d $@; \
|
||||
fi \
|
||||
if [ -d $$d ]; then \
|
||||
$(MAKE) -C $$d $@; \
|
||||
fi \
|
||||
done
|
||||
|
||||
endif # ! OS/2 command shell
|
||||
endif # ! non-bash
|
||||
|
||||
endif # ! Empty directory list
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ HB_GT_LIST=\
|
||||
# temporary workaround for some possible problems with some GNU make versions
|
||||
HB_GT_LIBS := $(HB_GT_LIST)
|
||||
|
||||
ifeq ($(SHLVL),) # An OS/2 command shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
ARCH_DIR = $(HB_ARCH)
|
||||
OS2_ARCH_DIR = $(subst /,\,$(HB_ARCH))
|
||||
|
||||
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(SHLVL),) # An OS/2 command shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
# We have to use script to overcome the max command size limit
|
||||
# NOTE: The empty line directly before 'endef' HAVE TO exist!
|
||||
|
||||
@@ -89,7 +89,7 @@ endif
|
||||
%.c : $(GRANDP)%.prg
|
||||
$(HB_RULE)
|
||||
|
||||
ifeq ($(SHLVL),) # COMMAND.COM
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
# Do nothing. the $(HB_ARCHITECTURE)/global.cf will handle clean up.
|
||||
else
|
||||
# Generic rule to clean up.
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
ifeq ($(PM),) # Only traverse directories if not compiling a specific module
|
||||
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
ifeq ($(DIRS),) # Empty directory list
|
||||
DIR_RULE =\
|
||||
@@ -25,6 +25,6 @@ DIR_RULE =\
|
||||
fi \
|
||||
done
|
||||
|
||||
endif # ! Windows
|
||||
endif # ! non-bash
|
||||
|
||||
endif # ! compiling a specific program module
|
||||
|
||||
@@ -26,7 +26,7 @@ ifeq ($(HB_DYNLIB),yes)
|
||||
HB_CDYNLIB=-DHB_DYNLIB
|
||||
endif
|
||||
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
# There is a conflict with the use of '\' and '/' characters
|
||||
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
|
||||
|
||||
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(SHLVL),) # NT shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ ARFLAGS = $(HB_USER_AFLAGS)
|
||||
RANLIB = $(HB_CCPREFIX)ranlib
|
||||
|
||||
ifeq ($(AR_RULE),)
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@
|
||||
else
|
||||
LIB_DIR_DOS_ = $(LIB_DIR)/$@
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
ifeq ($(PM),) # Only traverse directories if not compiling a specific module
|
||||
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
ifeq ($(DIRS),) # Empty directory list
|
||||
DIR_RULE =\
|
||||
@@ -25,6 +25,6 @@ DIR_RULE =\
|
||||
fi \
|
||||
done
|
||||
|
||||
endif # ! Windows
|
||||
endif # ! non-bash
|
||||
|
||||
endif # ! compiling a specific program module
|
||||
|
||||
@@ -22,7 +22,7 @@ ifeq ($(HB_DYNLIB),yes)
|
||||
HB_CDYNLIB=-DHB_DYNLIB
|
||||
endif
|
||||
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
# There is a conflict with the use of '\' and '/' characters
|
||||
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
|
||||
|
||||
@@ -8,7 +8,7 @@ INSTALL_RULE = @echo Done
|
||||
|
||||
else
|
||||
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
|
||||
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@ ARFLAGS = $(HB_USER_AFLAGS)
|
||||
RANLIB = $(HB_CCPREFIX)ranlib
|
||||
|
||||
ifeq ($(AR_RULE),)
|
||||
ifeq ($(SHLVL),) # NT Shell
|
||||
ifeq ($(SHLVL),) # non-bash
|
||||
LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@
|
||||
else
|
||||
LIB_DIR_DOS_ = $(LIB_DIR)/$@
|
||||
|
||||
Reference in New Issue
Block a user