diff options
| author | Robert Tari <robert@tari.in> | 2021-10-23 18:37:04 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2021-10-23 18:37:04 +0200 |
| commit | 7e4b6714abaf2245e3ba590c67e93c2adf4d0a69 (patch) | |
| tree | 271461a0a21ab24efe629878b162d6591d9b5b38 /docs/reference | |
| parent | 69f835796ad89c39f232aa4073c778976c54e01f (diff) | |
| parent | 91bddd96cf1f8d7975b1cb3b160b89c7f4a53af7 (diff) | |
| download | libayatana-appindicator-7e4b6714abaf2245e3ba590c67e93c2adf4d0a69.tar.gz libayatana-appindicator-7e4b6714abaf2245e3ba590c67e93c2adf4d0a69.tar.bz2 libayatana-appindicator-7e4b6714abaf2245e3ba590c67e93c2adf4d0a69.zip | |
Merge branch 'sunweaver-pr/bring-back-gtk2-build-support'
Attributes GH PR #32: https://github.com/AyatanaIndicators/libayatana-appindicator/pull/33
Diffstat (limited to 'docs/reference')
| -rw-r--r-- | docs/reference/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | docs/reference/scangobj.sh.in | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/docs/reference/CMakeLists.txt b/docs/reference/CMakeLists.txt index 6ae064a..487d9a1 100644 --- a/docs/reference/CMakeLists.txt +++ b/docs/reference/CMakeLists.txt @@ -1,3 +1,8 @@ +if (FLAVOUR_GTK3) + set (ayatana_appindicator_gtkver "ayatana-appindicator3") +elseif (FLAVOUR_GTK2) + set (ayatana_appindicator_gtkver "ayatana-appindicator") +endif() # libayatana-appindicator-docs.sgml @@ -50,6 +55,8 @@ add_custom_command( list(JOIN PROJECT_DEPS_INCLUDE_DIRS " -I" GTKDOC_SCANGOBJ_INCLUDE_DIRS) list(JOIN PROJECT_DEPS_LIBRARIES " -l" GTKDOC_SCANGOBJ_LIBRARIES) +set (SCANGOBJ_AYATANA_APPINDICATOR "${ayatana_appindicator_gtkver}") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scangobj.sh.in" "${CMAKE_CURRENT_BINARY_DIR}/scangobj.sh") # libayatana-appindicator.actions @@ -228,6 +235,6 @@ add_custom_command( ) set_source_files_properties("fixxref" PROPERTIES SYMBOLIC True) -install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gtk-doc/html/libayatana-appindicator") +install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html/" DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/gtk-doc/html/lib${ayatana_appindicator_gtkver}") add_custom_target("docs-references" ALL DEPENDS "fixxref") diff --git a/docs/reference/scangobj.sh.in b/docs/reference/scangobj.sh.in index 0272865..8cb2500 100644 --- a/docs/reference/scangobj.sh.in +++ b/docs/reference/scangobj.sh.in @@ -1 +1 @@ -LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/src" CFLAGS="-I${GTKDOC_SCANGOBJ_INCLUDE_DIRS}" LDFLAGS="-l${GTKDOC_SCANGOBJ_LIBRARIES} -L${CMAKE_BINARY_DIR}/src -layatana-appindicator3" gtkdoc-scangobj --type-init-func="g_type_init()" --module=libayatana-appindicator > /dev/null +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${CMAKE_BINARY_DIR}/src" CFLAGS="-I${GTKDOC_SCANGOBJ_INCLUDE_DIRS}" LDFLAGS="-l${GTKDOC_SCANGOBJ_LIBRARIES} -L${CMAKE_BINARY_DIR}/src -l${SCANGOBJ_AYATANA_APPINDICATOR}" gtkdoc-scangobj --type-init-func="g_type_init()" --module=libayatana-appindicator > /dev/null |