diff options
Diffstat (limited to 'xc/lib/X11/Imakefile')
| -rw-r--r-- | xc/lib/X11/Imakefile | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/xc/lib/X11/Imakefile b/xc/lib/X11/Imakefile index 90d40e00b..a567dfc3c 100644 --- a/xc/lib/X11/Imakefile +++ b/xc/lib/X11/Imakefile @@ -3,7 +3,7 @@ XCOMM $TOG: Imakefile /main/196 1997/05/20 10:06:09 kaleb $ -XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.27 1999/12/27 00:39:21 robin Exp $ +XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.29 2000/02/12 02:54:05 dawes Exp $ #define DoNormalLib NormalLibX11 #define DoSharedLib SharedLibX11 #define DoExtraLib SharedLibX11 @@ -62,6 +62,9 @@ EXTRA_LIBRARIES = /**/ #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS #endif +#if HasShm + SHM_DEFINES = -DHAS_SHM +#endif EDB_DEFINES = -DERRORDB=\"$(LIBDIR)/XErrorDB\" KDB_DEFINES = -DKEYSYMDB=\"$(LIBDIR)/XKeysymDB\" CMS_DEFINES = -DXCMSDB=\"$(LIBDIR)/Xcms.txt\" @@ -765,9 +768,6 @@ OBJS3 = \ #ifdef RsArchitecture LCDEPSYMSRCS = aixlcLoad.c #endif -#ifdef OS2Architecture -LCDEPSYMSRCS = os2Stubs.c -#endif LCSRCS = \ SetLocale.c \ @@ -818,6 +818,7 @@ LCSRCS = \ lcStd.c \ lcTxtPr.c \ lcUTF.c \ + lcUTF8.c \ lcUtil.c \ omDefault.c \ omGeneric.c \ @@ -836,9 +837,6 @@ LCDEPOBJS = XsunDL.o #ifdef RsArchitecture LCDEPOBJS = aixlcLoad.o #endif -#ifdef OS2Architecture -LCDEPOBJS = os2Stubs.o -#endif LCOBJS = \ SetLocale.o \ @@ -889,6 +887,7 @@ LCOBJS = \ lcStd.o \ lcTxtPr.o \ lcUTF.o \ + lcUTF8.o \ lcUtil.o \ omDefault.o \ omGeneric.o \ @@ -899,6 +898,14 @@ LCOBJS = \ omTextPer.o \ omXChar.o +#ifdef OS2Architecture +MISCSRCS = os2Stubs.c +#endif + +#ifdef OS2Architecture +MISCOBJS = os2Stubs.o +#endif + OBJS = $(OBJS1) $(OBJS2) $(OBJS3) #if !BuildServersOnly || XnestServer || BuildGLXLibrary @@ -914,6 +921,7 @@ LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c) SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES)) SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS)) SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),-I$(EXTINCSRC) $(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES)) +SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES)) SpecialCLibObjectRule(cmsColNm,$(ICONFIGFILES),$(CMS_DEFINES)) SpecialCLibObjectRule(globals,$(ICONFIGFILES),$(CONN_DEFINES)) SpecialCLibObjectRule(Context,$(ICONFIGFILES),$(BC_DEFINES)) |