All published Xaw3d header file are included this way. The -I directive to include/X11/Xaw3d is removed which will alert developers not to include header files with quotes unless they are in the /src directory.
Signed-off-by: Gaetan Nadon <[email protected]> --- src/AsciiSrc.c | 2 +- src/AsciiText.c | 2 +- src/Command.c | 2 +- src/Label.c | 2 +- src/List.c | 2 +- src/Makefile.am | 3 +-- src/MultiSrc.c | 2 +- src/Paned.c | 2 +- src/Scrollbar.c | 2 +- src/Simple.c | 2 +- src/SimpleMenu.c | 2 +- src/Sme.c | 2 +- src/SmeBSB.c | 2 +- src/SmeThreeD.c | 2 +- src/Text.c | 2 +- src/TextAction.c | 2 +- src/TextPop.c | 2 +- src/TextSrc.c | 2 +- src/ThreeD.c | 2 +- src/Tip.c | 2 +- src/Vendor.c | 2 +- src/Xaw3dP.c | 2 +- 22 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/AsciiSrc.c b/src/AsciiSrc.c index d14e0a0..0665cd3 100644 --- a/src/AsciiSrc.c +++ b/src/AsciiSrc.c @@ -30,7 +30,7 @@ in this Software without prior written authorization from the X Consortium. * */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <stdio.h> #include <ctype.h> diff --git a/src/AsciiText.c b/src/AsciiText.c index ff11be9..23843ac 100644 --- a/src/AsciiText.c +++ b/src/AsciiText.c @@ -65,7 +65,7 @@ SOFTWARE. * [email protected] */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Command.c b/src/Command.c index 2012f27..ccde19b 100644 --- a/src/Command.c +++ b/src/Command.c @@ -50,7 +50,7 @@ SOFTWARE. * Command.c - Command button widget */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Label.c b/src/Label.c index b3ecee9..ea885f7 100644 --- a/src/Label.c +++ b/src/Label.c @@ -51,7 +51,7 @@ SOFTWARE. * */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xos.h> diff --git a/src/List.c b/src/List.c index d4d114f..b9042ca 100644 --- a/src/List.c +++ b/src/List.c @@ -34,7 +34,7 @@ in this Software without prior written authorization from the X Consortium. * MIT X Consortium */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <stdio.h> #include <ctype.h> #include <X11/IntrinsicP.h> diff --git a/src/Makefile.am b/src/Makefile.am index f2a8267..e912004 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,7 @@ AM_CFLAGS = \ $(XPM_CFLAGS) AM_CPPFLAGS = \ - -I${top_srcdir}/include \ - -I${top_srcdir}/include/X11/Xaw3d \ + -I${top_srcdir}/include \ $(XAW3D_CPPFLAGS) # diff --git a/src/MultiSrc.c b/src/MultiSrc.c index 5ca85cb..f142428 100644 --- a/src/MultiSrc.c +++ b/src/MultiSrc.c @@ -58,7 +58,7 @@ in this Software without prior written authorization from the X Consortium. * */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xfuncs.h> diff --git a/src/Paned.c b/src/Paned.c index e72fd03..c7962c6 100644 --- a/src/Paned.c +++ b/src/Paned.c @@ -58,7 +58,7 @@ SOFTWARE. * [email protected] */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/cursorfont.h> #include <X11/StringDefs.h> diff --git a/src/Scrollbar.c b/src/Scrollbar.c index 8173dac..7fba176 100644 --- a/src/Scrollbar.c +++ b/src/Scrollbar.c @@ -56,7 +56,7 @@ SOFTWARE. /* created by weissman, Mon Jul 7 13:20:03 1986 */ /* converted by swick, Thu Aug 27 1987 */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Simple.c b/src/Simple.c index 13f03a5..f5928b3 100644 --- a/src/Simple.c +++ b/src/Simple.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/SimpleMenu.c b/src/SimpleMenu.c index 64fe3af..f3b44d9 100644 --- a/src/SimpleMenu.c +++ b/src/SimpleMenu.c @@ -38,7 +38,7 @@ in this Software without prior written authorization from the X Consortium. #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/Xaw3d/XawInit.h> #include <X11/Xaw3d/SimpleMenP.h> #include <X11/Xaw3d/SmeBSBP.h> diff --git a/src/Sme.c b/src/Sme.c index 2180846..dd563e8 100644 --- a/src/Sme.c +++ b/src/Sme.c @@ -33,7 +33,7 @@ in this Software without prior written authorization from the X Consortium. * [email protected] */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/SmeBSB.c b/src/SmeBSB.c index 84ef291..6236c04 100644 --- a/src/SmeBSB.c +++ b/src/SmeBSB.c @@ -38,7 +38,7 @@ in this Software without prior written authorization from the X Consortium. * [email protected] */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xos.h> diff --git a/src/SmeThreeD.c b/src/SmeThreeD.c index 2cce75f..1bc1885 100644 --- a/src/SmeThreeD.c +++ b/src/SmeThreeD.c @@ -23,7 +23,7 @@ SOFTWARE. ******************************************************************/ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/Xlib.h> #include <X11/StringDefs.h> #include <X11/IntrinsicP.h> diff --git a/src/Text.c b/src/Text.c index b1e4640..14d1080 100644 --- a/src/Text.c +++ b/src/Text.c @@ -46,7 +46,7 @@ SOFTWARE. ******************************************************************/ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Shell.h> diff --git a/src/TextAction.c b/src/TextAction.c index 287c0bd..f61864d 100644 --- a/src/TextAction.c +++ b/src/TextAction.c @@ -25,7 +25,7 @@ in this Software without prior written authorization from the X Consortium. */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xutil.h> diff --git a/src/TextPop.c b/src/TextPop.c index 7bf4536..1da2ebf 100644 --- a/src/TextPop.c +++ b/src/TextPop.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from the X Consortium. * *************************************************************/ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Shell.h> diff --git a/src/TextSrc.c b/src/TextSrc.c index 3f6898d..d8fe59b 100644 --- a/src/TextSrc.c +++ b/src/TextSrc.c @@ -35,7 +35,7 @@ in this Software without prior written authorization from the X Consortium. * */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xutil.h> diff --git a/src/ThreeD.c b/src/ThreeD.c index 331d2f0..83d570d 100644 --- a/src/ThreeD.c +++ b/src/ThreeD.c @@ -28,7 +28,7 @@ SOFTWARE. * Rights, permissions, and disclaimer per the above DEC/MIT license. */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/Xlib.h> #include <X11/StringDefs.h> #include <X11/IntrinsicP.h> diff --git a/src/Tip.c b/src/Tip.c index 82866f6..5835f42 100644 --- a/src/Tip.c +++ b/src/Tip.c @@ -32,7 +32,7 @@ * Rights, permissions, and disclaimer per the above XFree86 license. */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> #include <X11/Xos.h> diff --git a/src/Vendor.c b/src/Vendor.c index ec615ca..824ef0e 100644 --- a/src/Vendor.c +++ b/src/Vendor.c @@ -60,7 +60,7 @@ SOFTWARE. /* Make sure all wm properties can make it out of the resource manager */ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #include <stdio.h> #include <X11/IntrinsicP.h> #include <X11/StringDefs.h> diff --git a/src/Xaw3dP.c b/src/Xaw3dP.c index d31dc11..946de6d 100644 --- a/src/Xaw3dP.c +++ b/src/Xaw3dP.c @@ -27,7 +27,7 @@ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *********************************************************************/ -#include "Xaw3dP.h" +#include <X11/Xaw3d/Xaw3dP.h> #ifdef XAW_MULTIPLANE_PIXMAPS #include <stdio.h> #include <X11/xpm.h> -- 1.7.4.1 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
