Changeset 3232

Timestamp:

08/04/04 12:03:57 (9 years ago)

Author:

robert

Message:

Cleaned up the gdal-config usage to work with gdal-1.1.9

Location:

OpenSceneGraph/trunk

Files:

• Make/makedefs (modified) (10 diffs)
• src/osgPlugins/freetype/GNUmakefile (modified) (1 diff)

OpenSceneGraph/trunk/Make/makedefs

@@ -114 +114 @@
 INSTLOGFILE    = /tmp/.osg_inst_log
 
-LIBXML2_INCLUDE = -I/usr/include/libxml2
-
 ifneq ("$(OPENTHREADS_INC_DIR)","")
 INC += -I$(OPENTHREADS_INC_DIR)
@@ -217 +215 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 
@@ -305 +302 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 
@@ -390 +386 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
@@ -424 +419 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
@@ -457 +451 @@
   OTHER_LIBS        = -lm -lstdc++ -lobjc -lOpenThreads
   LIB_EXT           = dylib
-  LIBXML2_INCLUDE   = -I/usr/include/libxml2 -I/sw/include/libxml2 
   LIBVERSION        = -current_version $(VERSION) \
                         -compatibility_version \
@@ -475 +468 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif
@@ -513 +505 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
+  GDAL_INCLUDES     = `gdal-config --cflags`
   GDAL_LIBS         = `gdal-config --dep-libs`
   GDAL_LIBS         += `gdal-config --libs`
@@ -571 +563 @@
 
   GDAL_LIB          =  -lgdal -ljpeg -lgeotiff -ltiff -lpng -lz
-
-  LIBXML2_INCLUDE = -I/usr/mingw/include/libxml2
 
   LIBINST    = bin
@@ -641 +631 @@
   FREETYPE_LIB      = `freetype-config --libs`
 
-  GDAL_INCLUDES     = -I`gdal-config --prefix`/include
-  GDAL_LIBS         = `gdal-config --dep-libs`
-  GDAL_LIBS         += `gdal-config --libs`
+  GDAL_INCLUDES     = `gdal-config --cflags`
+  GDAL_LIBS         = `gdal-config --libs`
 
 endif

OpenSceneGraph/trunk/src/osgPlugins/freetype/GNUmakefile

@@ -7 +7 @@
         ReaderWriterFreeType.cpp\
 
+INC += $(FREETYPE_INCLUDE)
+
 LIBS   += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(OTHER_LIBS)
 
-ifneq ($(OS),HP-UX)
-INC += -I$(OSGHOME)/include \
-    -I/usr/include/freetype2 \
-    -I/usr/local/include \
-    -I/usr/local/include/freetype2  \
-    -I/usr/freeware/include \
-    -I/usr/freeware/include/freetype2
-endif
-INC += $(FREETYPE_INCLUDE)
 
 TARGET_BASENAME = freetype