From e96c0b735b83b64e155a072dc73384b68a173ee0 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Sat, 26 Jul 2003 01:02:39 +0000 Subject: [PATCH] Fixes to makedefs/makedirdefs ordering in some makefiles, and conditional build for osgslideshow on Sun --- GNUmakefile | 2 +- Make/makedirdefs | 8 +++++++- examples/GNUmakefile | 2 +- src/GNUmakefile | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 85da62748..7e93e65ee 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,6 @@ TOPDIR = . -include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedefs +include $(TOPDIR)/Make/makedirdefs DIRS = $(TOP_LEVEL_DIRS) diff --git a/Make/makedirdefs b/Make/makedirdefs index e633c0d6a..d805f00e0 100644 --- a/Make/makedirdefs +++ b/Make/makedirdefs @@ -150,12 +150,18 @@ EXAMPLE_DIRS = \ osgvertexprogram\ osgviewer\ osgwindows\ - slideshow3D\ # osgpagedlod\ # osgsimulation\ # osgdemeter\ # osgjigsaw\ + + +ifneq ($(OS),SunOS) +# Solaris requires an installation of libxml2 +EXAMPLE_DIRS += slideshow3D +endif + # comment in you want to compile the cluster demo. EXAMPLE_DIRS += osgcluster diff --git a/examples/GNUmakefile b/examples/GNUmakefile index 9905dfdc3..efce8ed65 100644 --- a/examples/GNUmakefile +++ b/examples/GNUmakefile @@ -1,6 +1,6 @@ TOPDIR = .. -include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedefs +include $(TOPDIR)/Make/makedirdefs DIRS = $(EXAMPLE_DIRS) diff --git a/src/GNUmakefile b/src/GNUmakefile index 139d1a359..8d65fea1e 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -1,6 +1,6 @@ TOPDIR = .. -include $(TOPDIR)/Make/makedirdefs include $(TOPDIR)/Make/makedefs +include $(TOPDIR)/Make/makedirdefs DIRS = $(SRC_DIRS)