diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:55 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:26:55 +0000 |
| commit | ea2a0b7d5958a702bdbcecc17c9c4dea8ce6def5 (patch) | |
| tree | fd868165c6da4b6f2ad504733f27803878a9d9bb /nto.rules | |
| parent | 272f68b2bffd736cede856a96231afe237261c8d (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'nto.rules')
| -rw-r--r-- | nto.rules | 24 |
1 files changed, 3 insertions, 21 deletions
@@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/nto.rules,v 1.4 2002/01/16 00:40:00 keithp Exp $ +XCOMM $XFree86: xc/config/cf/nto.rules,v 1.8 2003/10/11 09:40:15 herrb Exp $ XCOMM Rules for QNX/Neutrino XCOMM Note that some of these will disappear when we stop cross-compiling @@ -109,13 +109,6 @@ XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) #endif #ifndef SharedLibraryTarget -#ifdef UseInstalled -#define LinkBuildSonameLibrary(lib) true -#else -#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ - cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) -#endif - #define SharedLibraryTarget(libname,rev,solist,down,up) @@\ AllTarget(Concat(lib,libname.so.rev)) @@\ @@\ @@ -134,7 +127,7 @@ Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibrary(Concat(lib,libname.so)) @@\ @@\ clean:: @@\ - @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ + @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) #endif @@ -205,17 +198,6 @@ clean:: @@\ * SharedDepLibraryTarget - generate rules to create a shared library. */ #ifndef SharedDepLibraryTarget -#ifdef UseInstalled -#ifndef LinkBuildSonameLibrary -#define LinkBuildSonameLibrary(lib) true -#endif -#else -#ifndef LinkBuildSonameLibrary -#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ - cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) -#endif -#endif - #define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ AllTarget(Concat(lib,libname.so.rev)) @@\ @@\ @@ -234,7 +216,7 @@ Concat(lib,libname.so.rev): deplist $(EXTRALIBRARYDEPS) @@\ LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK)) @@\ @@\ clean:: @@\ - @MAJREV=`expr rev : '\([^.]*\)'`; \ @@\ + @MAJREV=`echo rev | sed 's/\.[^\.]*$$//'`; \ @@\ set -x; $(RM) Concat(lib,libname.so.$$MAJREV) @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) |