summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-04-20 11:40:07 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-04-20 11:40:07 +0200
commit19bb173b6d3e36b8d46235830a304c752451ae7e (patch)
tree49cafedb2f44322e8052cb1b3022bb2096dda4e3 /src
parentf159f5f6ebc891ca4ecdfa600f1bc427fece5f07 (diff)
downloadlibuca-19bb173b6d3e36b8d46235830a304c752451ae7e.tar.gz
libuca-19bb173b6d3e36b8d46235830a304c752451ae7e.tar.bz2
libuca-19bb173b6d3e36b8d46235830a304c752451ae7e.tar.xz
libuca-19bb173b6d3e36b8d46235830a304c752451ae7e.zip
Drop -gobject suffix
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt12
-rw-r--r--src/scangobj.sh.in2
-rw-r--r--src/uca.pc.in2
3 files changed, 8 insertions, 8 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}