diff options
Diffstat (limited to 'xc/config/cf/os2.rules')
| -rw-r--r-- | xc/config/cf/os2.rules | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/xc/config/cf/os2.rules b/xc/config/cf/os2.rules index 154e850ef..8d28329bd 100644 --- a/xc/config/cf/os2.rules +++ b/xc/config/cf/os2.rules @@ -2,7 +2,7 @@ XCOMM $XConsortium: os2.rules /main/1 1996/10/31 14:47:27 kaleb $ -XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.21 2000/04/05 18:13:09 dawes Exp $ .SUFFIXES: .Osuf .c .CCsuf @@ -22,6 +22,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 daw #define Fontc \bdftopcf #define MkFontDir \mkfontdir #define XkbComp \xkbcomp +#define PsWrap \pswrap #else #define ImakeHelper imakesvc #define IMmode u @@ -30,6 +31,7 @@ XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.20 1999/07/10 07:24:34 daw #define Fontc bdftopcf #define MkFontDir mkfontdir #define XkbComp xkbcomp +#define PsWrap pswrap #endif #define echo ImakeHelper 8 @@ -248,10 +250,10 @@ Makefile:: @@\ RMoveToBakFile(Makefile) @@\ ImakeSubCmdHelper -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) imakeflags -#define AssembleObject(flags) $(RM) $@ @@\ +#define AssembleObject(flags) RemoveFile($@) @@\ $(CPP) AsmDefines $(DEFINES) $(INCLUDES) flags $*.S | grep -v '^\#' > _tmp_.s @@\ $(CC) $(CFLAGS) -o $*.Osuf -c _tmp_.s @@\ - $(RM) _tmp_.s + RemoveFile(_tmp_.s) #define NormalAsmObjectRule() @@\ .S.Osuf: @@\ @@ -316,11 +318,11 @@ target.c: script dep @@\ $(MAKE) SHELL= MAKE=x11make $(MFLAGS) extra Concat(Build,target) @@\ @@\ Concat(Build,target): @@\ - $(RM) target.c @@\ + RemoveFile(target.c) @@\ script args @@\ @@\ clean:: @@\ - $(RM) target.c + RemoveFile(target.c) #ifndef ServerTargetWithFlags #define ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,flags) @@\ @@ -562,3 +564,14 @@ $(BUILDBINDIR)/binary: binary @@\ ImakeHelper 13 $(BUILDMODULEDIR) $(BUILDMODULETOP)/$(CURRENT_DIR)/module name #endif /* LinkBuildNamedModule */ +#ifndef MakeEncDir +#define MakeEncDir(deplist,inst,dirlist ) @@\ +AllTarget(encodings.dir) @@\ + @@\ +encodings.dir: deplist @@\ + RemoveFiles(encodings.dir fonts.dir) @@\ + ImakeHelper 16 MkFontDir dirlist @@\ + @@\ +clean:: @@\ + RemoveFiles(fonts.dir encodings.dir) +#endif |