From 479fc6d2f3c397a7d53bd77f8dd728dc483007f7 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 11 Feb 2002 02:34:30 +0000
Subject: [PATCH] Fixed a make install error on the plugins related to the old
 definitions for plugin names hanging around despite being deprecated.  These
 definiations confused the make install/make instclean so it tried to link a
 non existant library.  Have removed old definitions and everything intalls
 properly once more:-)

---
 src/osgPlugins/dw/Makefile        | 2 --
 src/osgPlugins/flt/Makefile       | 2 --
 src/osgPlugins/gif/Makefile       | 2 --
 src/osgPlugins/jpeg/Makefile      | 2 --
 src/osgPlugins/lib3ds/Makefile    | 2 --
 src/osgPlugins/lwo/Makefile       | 2 --
 src/osgPlugins/obj/Makefile       | 2 --
 src/osgPlugins/osg/Makefile       | 2 --
 src/osgPlugins/osgtgz/Makefile    | 2 --
 src/osgPlugins/pfb/Makefile       | 3 +++
 src/osgPlugins/pic/Makefile       | 2 --
 src/osgPlugins/png/Makefile       | 2 --
 src/osgPlugins/quicktime/Makefile | 2 --
 src/osgPlugins/tga/Makefile       | 2 --
 src/osgPlugins/tgz/Makefile       | 2 --
 src/osgPlugins/tiff/Makefile      | 2 --
 src/osgPlugins/txp/Makefile       | 2 --
 src/osgPlugins/zip/Makefile       | 2 --
 18 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/src/osgPlugins/dw/Makefile b/src/osgPlugins/dw/Makefile
index d43302d51..8d55c8deb 100644
--- a/src/osgPlugins/dw/Makefile
+++ b/src/osgPlugins/dw/Makefile
@@ -5,8 +5,6 @@ C++FILES = ReaderWriterDW.cpp
 
 TARGET_BASENAME = osgdb_dw
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/flt/Makefile b/src/osgPlugins/flt/Makefile
index 93f0e6751..7b3db76bc 100644
--- a/src/osgPlugins/flt/Makefile
+++ b/src/osgPlugins/flt/Makefile
@@ -45,8 +45,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_flt
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB = 
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/gif/Makefile b/src/osgPlugins/gif/Makefile
index 6d099979c..4e97d685f 100644
--- a/src/osgPlugins/gif/Makefile
+++ b/src/osgPlugins/gif/Makefile
@@ -6,8 +6,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_gif
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/jpeg/Makefile b/src/osgPlugins/jpeg/Makefile
index 6a9aa85e2..9412e4cfd 100644
--- a/src/osgPlugins/jpeg/Makefile
+++ b/src/osgPlugins/jpeg/Makefile
@@ -7,8 +7,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_jpeg
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-
 LIB = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
 TARGET_LOADER_FILES = osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
diff --git a/src/osgPlugins/lib3ds/Makefile b/src/osgPlugins/lib3ds/Makefile
index 194efb7d5..ab7d2f468 100644
--- a/src/osgPlugins/lib3ds/Makefile
+++ b/src/osgPlugins/lib3ds/Makefile
@@ -25,8 +25,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_3ds
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 LIB=
 
diff --git a/src/osgPlugins/lwo/Makefile b/src/osgPlugins/lwo/Makefile
index 3ae766938..b6071fef6 100644
--- a/src/osgPlugins/lwo/Makefile
+++ b/src/osgPlugins/lwo/Makefile
@@ -5,8 +5,6 @@ C++FILES = ReaderWriterLWO.cpp lw.cpp
 
 TARGET_BASENAME = osgdb_lwo
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 LIB=
 
diff --git a/src/osgPlugins/obj/Makefile b/src/osgPlugins/obj/Makefile
index 3139af111..48add882d 100644
--- a/src/osgPlugins/obj/Makefile
+++ b/src/osgPlugins/obj/Makefile
@@ -5,8 +5,6 @@ C++FILES = ReaderWriterOBJ.cpp glm.cpp
 
 TARGET_BASENAME = osgdb_obj
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 LIB=
 
diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile
index 55bc5f512..2e28b1f93 100644
--- a/src/osgPlugins/osg/Makefile
+++ b/src/osgPlugins/osg/Makefile
@@ -43,8 +43,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_osg
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 LIB=
 
diff --git a/src/osgPlugins/osgtgz/Makefile b/src/osgPlugins/osgtgz/Makefile
index 38c613e0f..2101bbda5 100644
--- a/src/osgPlugins/osgtgz/Makefile
+++ b/src/osgPlugins/osgtgz/Makefile
@@ -7,8 +7,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_osgtgz
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile
index f662829c9..b0fb80308 100644
--- a/src/osgPlugins/pfb/Makefile
+++ b/src/osgPlugins/pfb/Makefile
@@ -45,6 +45,9 @@ LIBS = -losg -losgDB \
 #   (note: you may need to build libimage.so from libimage.a)
 # LIBS += -limage
 
+LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
+LIB=
+
 TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.$(SO_EXT)
 
 C++FLAGS += -g -I../../../include 
diff --git a/src/osgPlugins/pic/Makefile b/src/osgPlugins/pic/Makefile
index 27ce87736..a9a526931 100644
--- a/src/osgPlugins/pic/Makefile
+++ b/src/osgPlugins/pic/Makefile
@@ -7,8 +7,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_pic
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(SO_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(SO_EXT)
 
diff --git a/src/osgPlugins/png/Makefile b/src/osgPlugins/png/Makefile
index cb8436c54..ed8029e43 100644
--- a/src/osgPlugins/png/Makefile
+++ b/src/osgPlugins/png/Makefile
@@ -8,8 +8,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_png
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/quicktime/Makefile b/src/osgPlugins/quicktime/Makefile
index 6e200fc9b..18a677c1b 100644
--- a/src/osgPlugins/quicktime/Makefile
+++ b/src/osgPlugins/quicktime/Makefile
@@ -9,8 +9,6 @@ CFILES = \
 
 TARGET_BASENAME = osgdb_qt
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 LIB=
 
diff --git a/src/osgPlugins/tga/Makefile b/src/osgPlugins/tga/Makefile
index 139a826f5..c95abd80a 100644
--- a/src/osgPlugins/tga/Makefile
+++ b/src/osgPlugins/tga/Makefile
@@ -7,8 +7,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_tga
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/tgz/Makefile b/src/osgPlugins/tgz/Makefile
index d4692d827..1dc73cb63 100644
--- a/src/osgPlugins/tgz/Makefile
+++ b/src/osgPlugins/tgz/Makefile
@@ -6,8 +6,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_tgz
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB =
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/tiff/Makefile b/src/osgPlugins/tiff/Makefile
index a66289f68..f9c89b0a7 100644
--- a/src/osgPlugins/tiff/Makefile
+++ b/src/osgPlugins/tiff/Makefile
@@ -7,8 +7,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_tiff
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/txp/Makefile b/src/osgPlugins/txp/Makefile
index 8647031b2..7e3574291 100644
--- a/src/osgPlugins/txp/Makefile
+++ b/src/osgPlugins/txp/Makefile
@@ -24,8 +24,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_txp
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB = 
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)
 
diff --git a/src/osgPlugins/zip/Makefile b/src/osgPlugins/zip/Makefile
index 38c14391a..97d63908b 100644
--- a/src/osgPlugins/zip/Makefile
+++ b/src/osgPlugins/zip/Makefile
@@ -6,8 +6,6 @@ C++FILES = \
 
 TARGET_BASENAME = osgdb_zip
 
-TARGET_LIB_FILES = lib$(TARGET_BASENAME).$(DL_EXT)
-
 LIB=
 LOADABLE = $(OSGHOME)/lib/osgPlugins/$(TARGET_BASENAME).$(DL_EXT)