Drop -gobject suffix

4 files changed, 24 insertions, 36 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eee703d..ab7ff62 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,13 +111,13 @@ include_directories(
 # --- Build target ------------------------------------------------------------
 add_definitions("-std=c99 -Wall")
 
-add_library(uca-gobject SHARED ${uca_SRCS})
+add_library(uca SHARED ${uca_SRCS})
 
-set_target_properties(uca-gobject PROPERTIES
+set_target_properties(uca PROPERTIES
       VERSION ${UCA_ABI_VERSION}
       SOVERSION ${UCA_VERSION_MINOR})
 
-target_link_libraries(uca-gobject 
+target_link_libraries(uca
     ${uca_LIBS})
 
 
@@ -178,12 +178,12 @@ if(GTK_DOC_FOUND)
             COMMAND ${GTK_DOC_SCAN}
                     --module=uca
                     --source-dir=${CMAKE_CURRENT_SOURCE_DIR}
-                    DEPENDS uca-gobject
+                    DEPENDS uca
             WORKING_DIRECTORY ${docs_out})
 
         add_custom_command(OUTPUT ${docs_out}/uca.args
             COMMAND sh scangobj.sh
-            DEPENDS uca-gobject ${docs_out}/uca-decl.txt
+            DEPENDS uca ${docs_out}/uca-decl.txt
             WORKING_DIRECTORY ${docs_out})
 
         add_custom_command(OUTPUT ${docs_out}/sgml.stamp
@@ -211,7 +211,7 @@ endif(GTK_DOC_FOUND)
 # --- Install target ----------------------------------------------------------
 set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
 
-install(TARGETS uca-gobject
+install(TARGETS uca
     LIBRARY DESTINATION ${LIB_INSTALL_DIR})
 
 install(FILES ${uca_HDRS}
diff --git a/src/scangobj.sh.in b/src/scangobj.sh.in
index 9b444ae..4a4e330 100644
--- a/src/scangobj.sh.in
+++ b/src/scangobj.sh.in
@@ -1 +1 @@
-LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR} CC=gcc CFLAGS="${GTK_DOC_CFLAGS}" LDFLAGS="${GTK_DOC_LDFLAGS} -L${CMAKE_CURRENT_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR} -luca-gobject `pkg-config --libs gtk+-2.0`" gtkdoc-scangobj --module=uca
+LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR} CC=gcc CFLAGS="${GTK_DOC_CFLAGS}" LDFLAGS="${GTK_DOC_LDFLAGS} -L${CMAKE_CURRENT_BINARY_DIR} -L${CMAKE_CURRENT_BINARY_DIR} -luca `pkg-config --libs gtk+-2.0`" gtkdoc-scangobj --module=uca
diff --git a/src/uca.pc.in b/src/uca.pc.in
index 26434f6..6401368 100644
--- a/src/uca.pc.in
+++ b/src/uca.pc.in
@@ -9,5 +9,5 @@ includedir_new=@includedir@
 Name: libuca
 Description: @UCA_DESCRIPTION@
 Version: @VERSION@
-Libs: -L${libdir} -luca-gobject
+Libs: -L${libdir} -luca
 Cflags: -I${includedir_old} -I${includedir_new}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7380179..8de0058 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,51 +17,39 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py ${CMAKE_CURRENT_BINARY_DIR})
 
 # --- Build targets -----------------------------------------------------------
 #add_executable(enum enum.c)
-add_executable(grab grab.c)
 #add_executable(grab-async grab-async.c)
 #add_executable(benchmark benchmark.c)
 
 #target_link_libraries(enum uca)
-target_link_libraries(grab uca-gobject ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 #target_link_libraries(grab-async uca)
 #target_link_libraries(benchmark uca)
 
-if (GTK2_FOUND)
-    include_directories(${GTK2_INCLUDE_DIRS})
-    add_executable(control control.c)
-    target_link_libraries(control
-        uca-gobject
-        ${GTK2_LIBRARIES}
-	    ${GTHREAD2_LIBRARIES}
-        )
-endif()
-
-
 include_directories(
     ${GLIB2_INCLUDE_DIRS}
     ${GOBJECT2_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/cameras
     )
 
+add_executable(grab grab.c)
+target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+
+if (GTK2_FOUND)
+    include_directories(${GTK2_INCLUDE_DIRS})
+    add_executable(control control.c)
+    target_link_libraries(control uca
+        ${GTK2_LIBRARIES} ${GTHREAD2_LIBRARIES})
+endif()
+
 if (HAVE_MOCK_CAMERA)
     add_executable(test-mock test-mock.c)
-    target_link_libraries(test-mock
-        uca-gobject 
-        ${GLIB2_LIBRARIES}
-        ${GOBJECT2_LIBRARIES}
-        )
+    target_link_libraries(test-mock uca
+        ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 endif()
 
 add_executable(test-all test-all.c)
-target_link_libraries(test-all
-    uca-gobject 
-    ${GLIB2_LIBRARIES}
-    ${GOBJECT2_LIBRARIES}
-    )
+target_link_libraries(test-all uca
+    ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 
 add_executable(perf-overhead perf-overhead.c)
-target_link_libraries(perf-overhead
-    uca-gobject 
-    ${GLIB2_LIBRARIES}
-    ${GOBJECT2_LIBRARIES}
-    )
+target_link_libraries(perf-overhead uca
+    ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})