aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/lib/X11')
-rw-r--r--nx-X11/lib/X11/Imakefile37
-rw-r--r--nx-X11/lib/X11/Imakefile.NX.original14
-rw-r--r--nx-X11/lib/X11/Imakefile.X.original2
3 files changed, 20 insertions, 33 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile
index d8d0601b8..bf7943e7c 100644
--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -63,7 +63,6 @@ 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
@@ -83,7 +82,7 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status
#define DoExtraLib SharedLibX11
#define DoDebugLib DebugLibX11
#define DoProfileLib ProfileLibX11
-#define LibName X11
+#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
@@ -1147,51 +1146,43 @@ 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)
- cd $(NX_XCOMPLIBDIR) && \
- gmake
+ ${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- gmake
+ ${MAKE} -C ../../../nxcompext
#else
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- make
+ ${MAKE} -C $(NX_XCOMPLIBDIR)
-$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- make
+$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET) $(NX_XCOMPLIBTARGET) lib$(LIBNAME).so.$(SOXLIBREV)
+ ${MAKE} -C ../../../nxcompext
#endif
-depend:: $(NX_XCOMPLIBTARGET)
+depend::
-all:: $(NX_XCOMPLIBTARGET)
+lib$(LIBNAME).so.$(SOXLIBREV): $(NX_XCOMPLIBTARGET)
-$(NX_XCOMPDEPTARGET):
- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME) $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- ln -s $(NX_XCOMPLIBDIR)/$(NX_XCOMPLIBNAME).1 $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
+all:: $(NX_XCOMPLIBTARGET)
depend:: $(NX_XCOMPLIBTARGET)
-all:: $(NX_XCOMPDEPTARGET) $(NX_XCOMPEXTLIBTARGET)
-
-clean::
- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME)
- rm -f $(BUILDLIBDIR)/$(NX_XCOMPLIBNAME).1
+all:: $(NX_XCOMPEXTLIBTARGET)
#endif
diff --git a/nx-X11/lib/X11/Imakefile.NX.original b/nx-X11/lib/X11/Imakefile.NX.original
index d8d0601b8..20b024a49 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 X11
+#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11
@@ -1159,21 +1159,17 @@ $(NX_XCOMPEXTCONFIGTARGET):
#ifdef SunArchitecture
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- gmake
+ ${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- gmake
+ ${MAKE} -C ../../../nxcompext
#else
$(NX_XCOMPLIBTARGET): $(NX_XCOMPCONFIGTARGET)
- cd $(NX_XCOMPLIBDIR) && \
- make
+ ${MAKE} -C $(NX_XCOMPLIBDIR)
$(NX_XCOMPEXTLIBTARGET): $(NX_XCOMPEXTCONFIGTARGET)
- cd ../../../nxcompext && \
- make
+ ${MAKE} -C ../../../nxcompext
#endif
diff --git a/nx-X11/lib/X11/Imakefile.X.original b/nx-X11/lib/X11/Imakefile.X.original
index 1f2c9b2bc..1596dbde9 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 X11
+#define LibName NX_X11
#define SoRev SOXLIBREV
#define HugeLibrary YES
#define IncSubdir X11