diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
| commit | 0a314adfa63669155299c77e479ed68c349643bd (patch) | |
| tree | 6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/lib/X11/Imakefile | |
| parent | 86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff) | |
| parent | 029bae127dabb92f6e50a3b07d51f4921986efb0 (diff) | |
| download | nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.gz nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.bz2 nx-libs-0a314adfa63669155299c77e479ed68c349643bd.zip | |
Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x
Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
Diffstat (limited to 'nx-X11/lib/X11/Imakefile')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index b3fc07adf..061f2e33e 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -806,7 +806,7 @@ SRCS3 = \ LockDis.c \ x11_trans.c \ xim_trans.c \ - $(XKBSRCS) $(LCSRCS) $(MISCSRCS) + $(XKBSRCS) $(LCSRCS) OBJS3 = \ Lab.o \ @@ -889,7 +889,7 @@ OBJS3 = \ LockDis.o \ x11_trans.o \ xim_trans.o \ - $(XKBOBJS) $(LCOBJS) $(MISCOBJS) + $(XKBOBJS) $(LCOBJS) SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c @@ -1036,14 +1036,6 @@ SHAREDLCOBJS = \ $(SHAREDLCDEPOBJS) \ $(SHAREDI18NSTATICOBJS) -#ifdef OS2Architecture -MISCSRCS = os2Stubs.c -#endif - -#ifdef OS2Architecture -MISCOBJS = os2Stubs.o -#endif - OBJS = $(OBJS1) $(OBJS2) $(OBJS3) EXTRAUNSHAREDOBJS = $(STATICLCOBJS) @@ -1086,10 +1078,6 @@ InstallNonExecFile(Xcms.txt,$(LIBDIR)) InstallNonExecFile(XErrorDB,$(LIBDIR)) InstallLintLibrary(X11,$(LINTLIBDIR)) -#ifdef QNX4Architecture -LOCAL_LDFLAGS=-F -#endif - MAKEKEYS = ./makekeys KEYSYMDEFS = $(XINCLUDESRC)/keysymdef.h $(XINCLUDESRC)/XF86keysym.h $(XINCLUDESRC)/Sunkeysym.h $(XINCLUDESRC)/DECkeysym.h $(XINCLUDESRC)/HPkeysym.h |