diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-03-28 08:58:35 +0100 |
| commit | db7feaf9883bb0dc419593588036405ef12ebca1 (patch) | |
| tree | 1a911fe1a08aed78845e17b5350c9238452a12dd /nx-X11/lib/X11 | |
| parent | e77bf36d9afbc7e56522574b06217d57c11dd095 (diff) | |
| download | nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.gz nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.tar.bz2 nx-libs-db7feaf9883bb0dc419593588036405ef12ebca1.zip | |
Revert "release 3.5.0.19"
This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095.
Diffstat (limited to 'nx-X11/lib/X11')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 37 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Imakefile.NX.original | 14 | ||||
| -rw-r--r-- | nx-X11/lib/X11/Imakefile.X.original | 2 |
3 files changed, 33 insertions, 20 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index bf7943e7c..d8d0601b8 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -63,6 +63,7 @@ NX_XCOMPLIBDIR = $(XTOP)/../nxcomp NX_XCOMPLIBLINK = Xcomp NX_XCOMPLIBTARGET = $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) NX_REQUIREDLIBS = -L$(NX_XCOMPLIBDIR) -l$(NX_XCOMPLIBLINK) +NX_XCOMPDEPTARGET = $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) NX_XCOMPCONFIGTARGET = $(NX_XCOMPLIBDIR)/config.status NX_XCOMPEXTLIBDIR = $(XTOP)/../nxcompext @@ -82,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 -#define LibName NX_X11 +#define LibName X11 #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 @@ -1146,43 +1147,51 @@ ks_tables.h: $(XINCLUDESRC)/keysymdef.h util/makekeys.c includes:: ks_tables.h -CONFIGURE ?= ./configure - #if NXLibraries $(NX_XCOMPCONFIGTARGET): cd ../../../nxcomp && \ - ${CONFIGURE} + ./configure $(NX_XCOMPEXTCONFIGTARGET): cd ../../../nxcompext && \ - ${CONFIGURE} + ./configure #ifdef SunArchitecture $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) - ${MAKE} -C $(NX_XCOMPLIBDIR) + cd $(NX_XCOMPLIBDIR) && \ + gmake $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) - ${MAKE} -C ../../../nxcompext + cd ../../../nxcompext && \ + gmake #else $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) - ${MAKE} -C $(NX_XCOMPLIBDIR) + cd $(NX_XCOMPLIBDIR) && \ + make -$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV) - ${MAKE} -C ../../../nxcompext +$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) + cd ../../../nxcompext && \ + make #endif -depend:: - -lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET) +depend:: $(NX_XCOMPLIBTARGET) all:: $(NX_XCOMPLIBTARGET) +$(NX_XCOMPDEPTARGET): + ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) + ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1 + depend:: $(NX_XCOMPLIBTARGET) -all:: $(NX_XCOMPEXTLIBTARGET) +all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET) + +clean:: + rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME) + rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1 #endif diff --git a/nx-X11/lib/X11/Imakefile.NX.original b/nx-X11/lib/X11/Imakefile.NX.original index 20b024a49..d8d0601b8 100644 --- a/nx-X11/lib/X11/Imakefile.NX.original +++ b/nx-X11/lib/X11/Imakefile.NX.original @@ -83,7 +83,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 -#define LibName NX_X11 +#define LibName X11 #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 @@ -1159,17 +1159,21 @@ $(NX_XCOMPEXTCONFIGTARGET): #ifdef SunArchitecture $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) - ${MAKE} -C $(NX_XCOMPLIBDIR) + cd $(NX_XCOMPLIBDIR) && \ + gmake $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) - ${MAKE} -C ../../../nxcompext + cd ../../../nxcompext && \ + gmake #else $(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET) - ${MAKE} -C $(NX_XCOMPLIBDIR) + cd $(NX_XCOMPLIBDIR) && \ + make $(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) - ${MAKE} -C ../../../nxcompext + cd ../../../nxcompext && \ + make #endif diff --git a/nx-X11/lib/X11/Imakefile.X.original b/nx-X11/lib/X11/Imakefile.X.original index 1596dbde9..1f2c9b2bc 100644 --- a/nx-X11/lib/X11/Imakefile.X.original +++ b/nx-X11/lib/X11/Imakefile.X.original @@ -28,7 +28,7 @@ BuildIncludes($(HEADERS),IncSubdir,..) #define DoExtraLib SharedLibX11 #define DoDebugLib DebugLibX11 #define DoProfileLib ProfileLibX11 -#define LibName NX_X11 +#define LibName X11 #define SoRev SOXLIBREV #define HugeLibrary YES #define IncSubdir X11 |