diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-17 20:49:53 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-11-17 20:49:53 +0100 |
| commit | 1f60704371940a34c51c1badad7de1a22aba5fb7 (patch) | |
| tree | 445e7075050d1f63e0110edfae979f1ccea34470 /nx-X11/lib/X11/Imakefile | |
| parent | cb8bcbec88d3a1f181809df3bd1df887e92055dd (diff) | |
| parent | de4eca1719d3d3e3d3c1767f2d33c30f87fa751c (diff) | |
| download | nx-libs-1f60704371940a34c51c1badad7de1a22aba5fb7.tar.gz nx-libs-1f60704371940a34c51c1badad7de1a22aba5fb7.tar.bz2 nx-libs-1f60704371940a34c51c1badad7de1a22aba5fb7.zip | |
Merge branch 'uli42-pr/remove_xlibi18n' into 3.6.x
Attributes GH PR #279: https://github.com/ArcticaProject/nx-libs/pull/279
Fixes ArcticaProject/nx-libs#264.
Diffstat (limited to 'nx-X11/lib/X11/Imakefile')
| -rw-r--r-- | nx-X11/lib/X11/Imakefile | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 5e3c06611..b3fc07adf 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -93,12 +93,6 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #endif -#if BuildLoadableXlibI18n -#define IHaveSubdirs -#define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" -#define NoLibSubdirs -#endif - #define DoNormalLib NormalLibX11 #define DoSharedLib SharedLibX11 #define DoExtraLib SharedLibX11 @@ -109,10 +103,6 @@ NX_XCOMPEXTCONFIGTARGET = $(NX_XCOMPEXTLIBDIR)/config.status #define HugeLibrary YES #define IncSubdir nx-X11 -#if BuildLoadableXlibI18n -SUBDIRS = xlibi18n -#endif - /* FIXME: This is switchable upstream via configure option, we leave it on for now as this is the upstream default. @@ -129,9 +119,6 @@ XCB_DEFINES = -DUSE_XCB=0 #ifdef SharedX11Reqs REQUIREDX11LIBS = SharedX11Reqs #endif -#if BuildLoadableXlibI18n -REQUIREDI18NLIBS = DlLibrary -#endif #ifdef cygwinArchitecture EXCLUDE_SYMBOL = -Wl,--exclude-symbol,XdmcpWrap:_XdmcpWrapperToOddParity #endif @@ -224,12 +211,7 @@ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSOR SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(EXTRASRCS) /* try *.c if you have trouble */ LINTLIBS = -#if BuildLoadableXlibI18n && DoSharedLib -EXTRASHAREDSRC = $(SHAREDLCSRCS) -#endif -#if !BuildLoadableXlibI18n || DoNormalLib EXTRASTATICSRC = $(STATICLCSRCS) -#endif EXTRASRCS = $(EXTRASHAREDSRC) $(EXTRASTATICSRC) @@ -909,10 +891,6 @@ OBJS3 = \ xim_trans.o \ $(XKBOBJS) $(LCOBJS) $(MISCOBJS) -#if BuildLoadableXlibI18n -LC_DYNDEFINES = -DUSE_DYNAMIC_LC -#endif - SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c SHAREDI18NSTATICSRCS = \ @@ -1070,11 +1048,7 @@ OBJS = $(OBJS1) $(OBJS2) $(OBJS3) EXTRAUNSHAREDOBJS = $(STATICLCOBJS) -#if BuildLoadableXlibI18n -EXTRASHAREDOBJS = $(SHAREDLCOBJS) -# else EXTRASHAREDOBJS = $(STATICLCOBJS) -#endif #include <Library.tmpl> @@ -1099,11 +1073,6 @@ SpecialCLibObjectRule(KeyBind,$(ICONFIGFILES),$(XKB_DEFINES)) SpecialCLibObjectRule(XKBBind,$(ICONFIGFILES),$(XKB_DEFINES)) SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES)) #endif -#if BuildLoadableXlibI18n -SpecialCLibObjectRuleSeparateOpts(lcInit,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES)) -SpecialCLibObjectRuleSeparateOpts(lcGeneric,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES)) -SpecialCLibObjectRuleSeparateOpts(lcPublic,$(ICONFIGFILES),$(_NOOP_),$(LC_DYNDEFINES)) -#endif #if BuildLoadableXlibXcursor SpecialCLibObjectRuleSeparateOpts(CrCursor,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES)) SpecialCLibObjectRuleSeparateOpts(CrGlCur,$(ICONFIGFILES),$(_NOOP_),$(XCURSOR_DEFINES)) @@ -1155,12 +1124,6 @@ StrKeysym.o: ks_tables.h DependTarget3($(SRCS1),$(SRCS2),$(SRCS3) $(EXTRASRCS)) -#if BuildLoadableXlibI18n -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -MakeLintLibSubdirs($(LINTSUBDIRS)) -MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln) -#endif #endif includes:: XlibConf.h pathmax.h |