equal
deleted
inserted
replaced
1 # -*- Makefile -*- rules common to Xorg, Xvfb, Xvnc main build trees |
1 # -*- Makefile -*- rules common to all xserver build trees |
2 # |
2 # |
3 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
3 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. |
4 # |
4 # |
5 # Permission is hereby granted, free of charge, to any person obtaining a |
5 # Permission is hereby granted, free of charge, to any person obtaining a |
6 # copy of this software and associated documentation files (the "Software"), |
6 # copy of this software and associated documentation files (the "Software"), |
7 # to deal in the Software without restriction, including without limitation |
7 # to deal in the Software without restriction, including without limitation |
8 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
8 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
37 |
37 |
38 ### Include common definitions |
38 ### Include common definitions |
39 include $(TOP)/open-src/common/Makefile.init |
39 include $(TOP)/open-src/common/Makefile.init |
40 |
40 |
41 # Xorg server source tarball to use sources from |
41 # Xorg server source tarball to use sources from |
42 XORGSERVER_VERS=1.7.7 |
42 XORGSERVER_VERS=1.9.4 |
43 |
43 |
44 # Patches shared between Xephyr Xorg Xvfb Xvnc Xdmx builds |
44 # Patches shared between Xorg & Xvnc builds |
45 XORG_SOURCE_PATCHES:sh=cat -s ../xorg/patch-list ../xorg/closed-src/patch-list | sed '/^\#/ d' |
45 XORG_SOURCE_PATCHES:sh=sed '/^\#/ d' ../xorg/patch-list |
46 |
46 |
47 SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir)' |
47 SERVER_MODULES_DIR='$(X11_SERVERMODS_DIR)$(SERVERMOD_subdir)' |
48 DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri$(SERVERMOD_subdir)' |
48 DRI_MODULES_DIR='$(X11_SERVERMODS_DIR)/dri$(SERVERMOD_subdir)' |
49 |
49 |
50 # Changes to apply to man pages |
50 # Changes to apply to man pages |