diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-09 18:54:39 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-09 18:54:39 +0000 |
| commit | d8d64f070eb8b9d1364b9791c17aa32a21e8eb31 (patch) | |
| tree | 869132dfae3e70791e60670b888aaae72422034c /libX11/src/makefile | |
| parent | a32fb49df0a63bee951f98e7583396c3adb28ad3 (diff) | |
| parent | bfb19bed915a30b5542fe8fee4e91151f25ec3b9 (diff) | |
| download | vcxsrv-d8d64f070eb8b9d1364b9791c17aa32a21e8eb31.tar.gz vcxsrv-d8d64f070eb8b9d1364b9791c17aa32a21e8eb31.tar.bz2 vcxsrv-d8d64f070eb8b9d1364b9791c17aa32a21e8eb31.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src/makefile')
| -rw-r--r-- | libX11/src/makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libX11/src/makefile b/libX11/src/makefile index f928a38e2..e89f573c7 100644 --- a/libX11/src/makefile +++ b/libX11/src/makefile @@ -257,11 +257,12 @@ CSRCS = \ WMGeom.c \ WMProps.c \ WrBitF.c \ + xcb_disp.c \ + xcb_io.c \ XlibAsync.c \ XlibInt.c \ Xrm.c \ - xcb_disp.c \ - xcb_io.c + INCLUDES := . xcms xlibi18n xkb $(MHMAKECONF)\X11 $(OBJDIR) $(INCLUDES) @@ -272,6 +273,6 @@ $(OBJDIR)\$(LIBRARY).lib: $(OBJDIR)\ks_tables.h load_makefile util\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG) $(OBJDIR)\ks_tables.h: $(KEYSYMDEF) util\$(OBJDIR)\makekeys.exe - util\$(OBJDIR)\makekeys < $(relpath $<) > $(relpath $@) + util\$(OBJDIR)\makekeys $(relpath $<) > $(relpath $@) |