Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the

local makefiles.

Small change in txp loader for sun build

src/osgPlugins/txp/trpage_write.h

@@ -268,11 +268,7 @@ public:
 	bool isValid(void) const;
 	const char *getErrMess() const;
 	char* getDir(void){return dir;};
-protected:
-	// Set if we're adding to an existing archive
-	bool isRegenerate;
 
-	// Used to keep track of which tiles are in which file
 	class TileFileEntry {
 	public:
 		int x,y,lod;    // Identifying info for tile
@@ -285,6 +281,12 @@ protected:
 		std::vector<TileFileEntry> tiles;
 	};
 
+protected:
+	// Set if we're adding to an existing archive
+	bool isRegenerate;
+
+	// Used to keep track of which tiles are in which file
+
 	trpgEndian ness,cpuNess;
 	int version;
 	// Fed in from the outside

src/osgProducer/GNUmakefile

@@ -16,7 +16,6 @@ DEF  += -DOSGPRODUCER_LIBRARY
 TARGET_BASENAME = osgProducer
 LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)
 
-INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
-LDFLAGS  += $(PRODUCER_LIB_DIR)
+INC += -I/usr/X11R6/include
     
 include $(TOPDIR)/Make/makerules