diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-19 22:15:01 +0200 |
| commit | 70ac75f4ab184c21d11b9840a47362610aaef481 (patch) | |
| tree | 183b9ec7e6897fb2cea7296b461a35ca93dfce6e /nx-X11/lib/X11/xlibi18n/lc | |
| parent | 6c303d9e4ffd162b8c7f59a4b135e592d923a656 (diff) | |
| parent | 70e9d346fe34af127d2c827c3678e53d0f4312ae (diff) | |
| download | nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.gz nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.tar.bz2 nx-libs-70ac75f4ab184c21d11b9840a47362610aaef481.zip | |
Merge branch 'uli42-pr/libX11_further_backports' into 3.6.x
Attributes GH PR #222: https://github.com/ArcticaProject/nx-libs/pull/222
Diffstat (limited to 'nx-X11/lib/X11/xlibi18n/lc')
| -rw-r--r-- | nx-X11/lib/X11/xlibi18n/lc/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/nx-X11/lib/X11/xlibi18n/lc/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/Imakefile index a4eaeeb6f..16f7aceb3 100644 --- a/nx-X11/lib/X11/xlibi18n/lc/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/lc/Imakefile @@ -2,7 +2,7 @@ XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" -SUBDIRS = gen def Utf8 xlocale +SUBDIRS = gen def Utf8 MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile deleted file mode 100644 index 5ead4b763..000000000 --- a/nx-X11/lib/X11/xlibi18n/lc/xlocale/Imakefile +++ /dev/null @@ -1,14 +0,0 @@ - -#include "../../Xi18nLib.conf" - - EXTRA_INCLUDES = -I../../.. - XI18NLIBNAME = xlocale - SRCS = lcEuc.c lcSjis.c lcJis.c - OBJS = ${SRCS:.c=.o} - REQUIREDLIBS = SharedXlibi18nReqs - -LinkSourceFile(lcEuc.c, ../../..) -LinkSourceFile(lcSjis.c, ../../..) -LinkSourceFile(lcJis.c, ../../..) - -Xi18nLibraryTarget(xlocale) |