From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Wed, 13 Apr 2011 07:34:38 +0000 (+0100)
Subject: Rename libglxtrace.so back to glxtrace.so.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=c00b74e55b60c53ee82446ca53e55de891dcc169;p=apitrace

Rename libglxtrace.so back to glxtrace.so.

The rename was an unintentional side effect of my commit
c2d9f8a4ab2e4b555b918d47fe3313f862009e4d and the lib prefix is
misleading given the shared object is not meant to be linked against,
but always loaded via LD_PRELOAD.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab70358..1860e3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,11 @@ else ()
     )
 
     add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
+
+    set_target_properties (glxtrace PROPERTIES
+        PREFIX ""
+    )
+
     target_link_libraries (glxtrace dl)
 endif ()
 
diff --git a/README b/README
index b923a9c..8091a41 100644
--- a/README
+++ b/README
@@ -85,7 +85,7 @@ http://www.cmake.org/Wiki/CmakeMingw for detailed instructions.
 
 * Run the application you want to trace as
 
- LD_PRELOAD=/path/to/libglxtrace.so /path/to/application
+ LD_PRELOAD=/path/to/glxtrace.so /path/to/application
 
 * View the trace with
 
diff --git a/gui/traceprocess.cpp b/gui/traceprocess.cpp
index 8074fa1..d07e400 100644
--- a/gui/traceprocess.cpp
+++ b/gui/traceprocess.cpp
@@ -8,19 +8,19 @@
 static QString
 findPreloader()
 {
-    QString libPath = QString::fromLatin1("%1/libglxtrace.so")
+    QString libPath = QString::fromLatin1("%1/glxtrace.so")
                       .arg(BUILD_DIR);
 
     QFileInfo fi(libPath);
     if (fi.exists())
         return libPath;
 
-    libPath = QString::fromLatin1("/usr/local/lib/libglxtrace.so");
+    libPath = QString::fromLatin1("/usr/local/lib/glxtrace.so");
     fi = QFileInfo(libPath);
     if (fi.exists())
         return libPath;
 
-    libPath = QString::fromLatin1("/usr/lib/libglxtrace.so");
+    libPath = QString::fromLatin1("/usr/lib/glxtrace.so");
     fi = QFileInfo(libPath);
     if (fi.exists())
         return libPath;