Added X_INC into the Make/makedefs and changed the *GNUmakefile* to use it.

2003-08-18 10:58:30 +00:00
parent 8c65920c1f
commit 8d5aa5644d
92 changed files with 100 additions and 92 deletions
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -193,6 +193,7 @@ ifeq ($(OS),SunOS)
    DYNAMICLIBRARYLIB = -ldl
    OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
    GL_LIBS           = -lGLU -lGL 
+    X_INC             = -I/usr/X11R6/include
    X_LIBS            = -lXext -lXmu -lXi -lX11 
    SOCKET_LIBS       = -lsocket -lnsl
    INSTBINCMD        = cp
@@ -239,6 +240,7 @@ ifeq ($(OS),IRIX)
  DYNAMICLIBRARYLIB = 
  OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
  GL_LIBS           = -lGLU -lGL 
+  X_INC             = -I/usr/X11R6/include
  X_LIBS            = -lXext -lXi -lXmu -lX11
  SOCKET_LIBS       = 
  OTHER_LIBS        = -lm -lOpenThreads
@@ -305,6 +307,7 @@ ifeq ($(OS),Linux)
  OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
  FREETYPE_LIB      = -lfreetype
  GL_LIBS           = -lGLU -lGL 
+  X_INC             = -I/usr/X11R6/include
  X_LIBS            = -lXi -lXmu -lX11
  PF_XTRA_LIBS      = -L/usr/lib/libpfdb   -Xlinker -rpath /usr/lib/libpfdb \
                      -lpfdu -lpfutil -lpf 
@@ -334,6 +337,7 @@ ifeq ($(OS),FreeBSD)
  OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
  FREETYPE_LIB      = -lfreetype
  GL_LIBS           = -lGLU -lGL 
+  X_INC             = -I/usr/X11R6/include
  X_LIBS            = -lXmu -lX11
  SOCKET_LIBS       = 
  OTHER_LIBS        = -lOpenThreads
@@ -360,6 +364,7 @@ ifeq ($(OS),Darwin)
  FREETYPE_LIB      = -lfreetype
  CARBON_LIB        = -framework Carbon
  GL_LIBS           = -framework OpenGL $(CARBON_LIB)
+  X_INC             = -I/usr/X11R6/include
  X_LIBS            = -lX11 
  SOCKET_LIBS       = 
  OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
@@ -391,6 +396,7 @@ ifeq ($(OS),CYGWIN)
  DYNAMICLIBRARYLIB =
  OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
  GL_LIBS           = -lglu32 -lopengl32
+  X_INC             = 
  X_LIBS            = -lgdi32 -luser32
  SOCKET_LIBS       = 
  OTHER_LIBS        = -lOpenThreads
@@ -436,6 +442,7 @@ ifeq ($(OS),MINGW)
  DYNAMICLIBRARYLIB =
  OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
  GL_LIBS           = -lglu32 -lopengl32
+  X_INC             = 
  X_LIBS            = -lgdi32 -luser32
  SOCKET_LIBS       = 
  OTHER_LIBS        = -lOpenThreads
@@ -492,6 +499,7 @@ endif
  DYNAMICLIBRARYLIB = -ldld
  OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
  GL_LIBS           = -L/opt/graphics/OpenGL/lib -lGLU -lGL 
+  X_INC             = -I/usr/X11R6/include
  X_LIBS            = -L/usr/lib/X11R6 -lXext -lXi -lX11 -L/usr/lib/X11R4 -lXmu
  SOCKET_LIBS       = 
  # make sure that global constructors/destructors are called upon
--- a/examples/osganimate/GNUmakefile
+++ b/examples/osganimate/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osganimate

-INC      += -I/usr/X11R6/include
+INC      += $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osganimate/GNUmakefile.inst
+++ b/examples/osganimate/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osganimate

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgautotransform/GNUmakefile
+++ b/examples/osgautotransform/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgautotransform

-INC 	 +=  -I/usr/X11R6/include
+INC 	 +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgautotransform/GNUmakefile.inst
+++ b/examples/osgautotransform/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgProducer -lProducer -losgDB

 EXEC = osgautotransform

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgbillboard/GNUmakefile
+++ b/examples/osgbillboard/GNUmakefile
@@ -13,6 +13,6 @@ INSTFILES = \

 EXEC = osgbillboard

-INC 	 +=  -I/usr/X11R6/include
+INC 	 +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgbillboard/GNUmakefile.inst
+++ b/examples/osgbillboard/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgbillboard

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgcallback/GNUmakefile
+++ b/examples/osgcallback/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgcallback

-INC      += -I/usr/X11R6/include
+INC      += $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgcallback/GNUmakefile.inst
+++ b/examples/osgcallback/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgcallback

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)


--- a/examples/osgcameragroup/GNUmakefile
+++ b/examples/osgcameragroup/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgcameragroup

-INC      += -I/usr/X11R6/include 
+INC      += $(X_INC) 
 LDFLAGS  += -L/usr/X11R6/lib


--- a/examples/osgcameragroup/GNUmakefile.inst
+++ b/examples/osgcameragroup/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgcameragroup

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgclip/GNUmakefile
+++ b/examples/osgclip/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgclip

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgclip/GNUmakefile.inst
+++ b/examples/osgclip/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgclip

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgcluster/GNUmakefile
+++ b/examples/osgcluster/GNUmakefile
@@ -21,6 +21,6 @@ INSTFILES = \
 EXEC = osgcluster


-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgcluster/GNUmakefile.inst
+++ b/examples/osgcluster/GNUmakefile.inst
@@ -10,7 +10,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgcluster

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgconv/GNUmakefile.inst
+++ b/examples/osgconv/GNUmakefile.inst
@@ -15,7 +15,7 @@ INSTFILES =\
 	$(CXXFILES)\
 	Makefile.inst=Makefile

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgcopy/GNUmakefile
+++ b/examples/osgcopy/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgcopy

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgcopy/GNUmakefile.inst
+++ b/examples/osgcopy/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgcopy

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgcubemap/GNUmakefile
+++ b/examples/osgcubemap/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgcubemap

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgcubemap/GNUmakefile.inst
+++ b/examples/osgcubemap/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 EXEC = osgcubemap


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgdemeter/GNUmakefile
+++ b/examples/osgdemeter/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgdemeter

-INC +=  -I/usr/X11R6/include 
+INC +=  $(X_INC) 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgdemeter/GNUmakefile.inst
+++ b/examples/osgdemeter/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgviewer

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osggeodemo/GNUmakefile
+++ b/examples/osggeodemo/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osggeodemo

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osggeodemo/GNUmakefile.inst
+++ b/examples/osggeodemo/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 EXEC = osggeomdemo


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osggeometry/GNUmakefile
+++ b/examples/osggeometry/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osggeometry

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osggeometry/GNUmakefile.inst
+++ b/examples/osggeometry/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osggeometry

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osghangglide/GNUmakefile
+++ b/examples/osghangglide/GNUmakefile
@@ -27,6 +27,6 @@ INSTFILES = \

 EXEC = osghangglide

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osghangglide/GNUmakefile.inst
+++ b/examples/osghangglide/GNUmakefile.inst
@@ -16,7 +16,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osghangglide

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osghud/GNUmakefile
+++ b/examples/osghud/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osghud

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osghud/GNUmakefile.inst
+++ b/examples/osghud/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgProducer -lProducer -losgDB

 EXEC = osghud

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgimpostor/GNUmakefile
+++ b/examples/osgimpostor/GNUmakefile
@@ -13,6 +13,6 @@ INSTFILES = \

 EXEC = osgimpostor

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgimpostor/GNUmakefile.inst
+++ b/examples/osgimpostor/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgimpostor

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgkeyboard/GNUmakefile
+++ b/examples/osgkeyboard/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgkeyboard

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgkeyboard/GNUmakefile.inst
+++ b/examples/osgkeyboard/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS
 EXEC = osgkeyboard


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osglight/GNUmakefile
+++ b/examples/osglight/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osglight

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osglight/GNUmakefile.inst
+++ b/examples/osglight/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 EXEC = osglight


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osglightpoint/GNUmakefile.inst
+++ b/examples/osglightpoint/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgSim -losgProducer -lProducer -losgDB -losgText -losgUtil -losg
 EXEC = osglightpoint


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osglogo/GNUmakefile
+++ b/examples/osglogo/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osglogo

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osglogo/GNUmakefile.inst
+++ b/examples/osglogo/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgText -losgProducer -lProducer -losgDB -losgText -losgUtil -losg

 EXEC = osglogo

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgmultitexture/GNUmakefile
+++ b/examples/osgmultitexture/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgmultitexture

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgmultitexture/GNUmakefile.inst
+++ b/examples/osgmultitexture/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 EXEC = osgmultitexture


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgoccluder/GNUmakefile
+++ b/examples/osgoccluder/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgoccluder

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgoccluder/GNUmakefile.inst
+++ b/examples/osgoccluder/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 EXEC = osgoccluder


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgparticle/GNUmakefile
+++ b/examples/osgparticle/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgparticle

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgparticle/GNUmakefile.inst
+++ b/examples/osgparticle/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS
 EXEC = osgparticle


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgpick/GNUmakefile
+++ b/examples/osgpick/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgpick

-INC +=  -I/usr/X11R6/include 
+INC +=  $(X_INC) 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgpick/GNUmakefile.inst
+++ b/examples/osgpick/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgpick

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgpoints/GNUmakefile
+++ b/examples/osgpoints/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgpoints

-INC +=  -I/usr/X11R6/include 
+INC +=  $(X_INC) 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgpoints/GNUmakefile.inst
+++ b/examples/osgpoints/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgpoints

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgprerender/GNUmakefile
+++ b/examples/osgprerender/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgprerender

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgprerender/GNUmakefile.inst
+++ b/examples/osgprerender/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgprerender

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgprerendercubemap/GNUmakefile
+++ b/examples/osgprerendercubemap/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgprerendercubemap

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgprerendercubemap/GNUmakefile.inst
+++ b/examples/osgprerendercubemap/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgprerendercubemap

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgreflect/GNUmakefile
+++ b/examples/osgreflect/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgreflect

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgreflect/GNUmakefile.inst
+++ b/examples/osgreflect/GNUmakefile.inst
@@ -8,11 +8,11 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgviewer

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgscribe/GNUmakefile
+++ b/examples/osgscribe/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgscribe

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgscribe/GNUmakefile.inst
+++ b/examples/osgscribe/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgscribe

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgsequence/GNUmakefile
+++ b/examples/osgsequence/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgsequence

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgsequence/GNUmakefile.inst
+++ b/examples/osgsequence/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgtexture

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgshaders/GNUmakefile
+++ b/examples/osgshaders/GNUmakefile
@@ -13,7 +13,7 @@ INSTFILES = \

 EXEC = osgshaders

-INC +=  -I/usr/X11R6/include 
+INC +=  $(X_INC) 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgshaders/GNUmakefile.inst
+++ b/examples/osgshaders/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgGL2 -losgUtil -losg

 EXEC = osgshaders

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgshadowtexture/GNUmakefile
+++ b/examples/osgshadowtexture/GNUmakefile
@@ -13,6 +13,6 @@ INSTFILES = \

 EXEC = osgshadowtexture

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgshadowtexture/GNUmakefile.inst
+++ b/examples/osgshadowtexture/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgshadowtexture

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgshape/GNUmakefile
+++ b/examples/osgshape/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgshape

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgshape/GNUmakefile.inst
+++ b/examples/osgshape/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS

 EXEC = osgshape

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgstereoimage/GNUmakefile
+++ b/examples/osgstereoimage/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgstereoimage

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgstereoimage/GNUmakefile.inst
+++ b/examples/osgstereoimage/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgGA -losgDB -losgUtil -losg $

 EXEC = osgstereoimage

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)


--- a/examples/osgteapot/GNUmakefile
+++ b/examples/osgteapot/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgteapot

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgteapot/GNUmakefile.inst
+++ b/examples/osgteapot/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgcube

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgtext/GNUmakefile
+++ b/examples/osgtext/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgtext

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgtext/GNUmakefile.inst
+++ b/examples/osgtext/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgProducer -lProducer -losgDB

 EXEC = osgtext

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgtexture1D/GNUmakefile
+++ b/examples/osgtexture1D/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgtexture1D

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexture1D/GNUmakefile.inst
+++ b/examples/osgtexture1D/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgDB -losgText -losgUtil -losg

 EXEC = osgtexture1D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgtexture2D/GNUmakefile
+++ b/examples/osgtexture2D/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgtexture2D

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexture2D/GNUmakefile.inst
+++ b/examples/osgtexture2D/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgtexture2D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgtexture3D/GNUmakefile
+++ b/examples/osgtexture3D/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgtexture3D

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexture3D/GNUmakefile.inst
+++ b/examples/osgtexture3D/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS

 EXEC = osgtexture3D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgtexturerectangle/GNUmakefile
+++ b/examples/osgtexturerectangle/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgtexturerectangle

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgtexturerectangle/GNUmakefile.inst
+++ b/examples/osgtexturerectangle/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgtexturerectangle

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgunittests/GNUmakefile
+++ b/examples/osgunittests/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgunittests

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgunittests/GNUmakefile.inst
+++ b/examples/osgunittests/GNUmakefile.inst
@@ -9,7 +9,7 @@ LIBS     += -losgProducer -lProducer -losgText -losgDB -losgUtil -losg $(GL_LIBS
 EXEC = osgunittests


-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgversion/GNUmakefile
+++ b/examples/osgversion/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgversion

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgversion/GNUmakefile.inst
+++ b/examples/osgversion/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgversion

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgvertexprogram/GNUmakefile
+++ b/examples/osgvertexprogram/GNUmakefile
@@ -12,6 +12,6 @@ INSTFILES = \

 EXEC = osgvertexprogram

-INC +=  -I/usr/X11R6/include
+INC +=  $(X_INC)

 include $(TOPDIR)/Make/makerules 
--- a/examples/osgvertexprogram/GNUmakefile.inst
+++ b/examples/osgvertexprogram/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgvertexprogram

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgviewer/GNUmakefile
+++ b/examples/osgviewer/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgviewer

-INC +=  -I/usr/X11R6/include 
+INC +=  $(X_INC) 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgviewer/GNUmakefile.inst
+++ b/examples/osgviewer/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgviewer

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/osgwindows/GNUmakefile
+++ b/examples/osgwindows/GNUmakefile
@@ -12,7 +12,7 @@ INSTFILES = \

 EXEC = osgwindows

-INC +=  -I/usr/X11R6/include 
+INC +=  $(X_INC) 

 include $(TOPDIR)/Make/makerules 

--- a/examples/osgwindows/GNUmakefile.inst
+++ b/examples/osgwindows/GNUmakefile.inst
@@ -8,7 +8,7 @@ LIBS     += -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(GL_LIBS

 EXEC = osgwindows

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC)
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/examples/slideshow3D/GNUmakefile
+++ b/examples/slideshow3D/GNUmakefile
@@ -16,7 +16,7 @@ INSTFILES = \

 EXEC = slideshow3D

-INC +=  -I/usr/X11R6/include -I/usr/include/libxml2
+INC +=  $(X_INC) -I/usr/include/libxml2

 include $(TOPDIR)/Make/makerules 

--- a/examples/slideshow3D/GNUmakefile.inst
+++ b/examples/slideshow3D/GNUmakefile.inst
@@ -12,7 +12,7 @@ LIBS     += -lxml2 -losgProducer -lProducer -losgDB -losgText -losgUtil -losg $(

 EXEC = slideshow3D

-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include -I/usr/include/libxml2
+INC += $(PRODUCER_INCLUDE_DIR) $(X_INC) -I/usr/include/libxml2
 LDFLAGS  += $(PRODUCER_LIB_DIR)

 include $(TOPDIR)/Make/makerules
--- a/src/osgProducer/GNUmakefile
+++ b/src/osgProducer/GNUmakefile
@@ -16,6 +16,6 @@ DEF  += -DOSGPRODUCER_LIBRARY
 TARGET_BASENAME = osgProducer
 LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)

-INC += -I/usr/X11R6/include
+INC += $(X_INC)
    
 include $(TOPDIR)/Make/makerules