diff options
| -rw-r--r--[-rwxr-xr-x] | CMakeLists.txt | 21 | ||||
| -rw-r--r--[-rwxr-xr-x] | launchpad_src/launchpad.c | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | packaging/aul.spec | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/key.c | 2 |
4 files changed, 25 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a1acf649..e3232e5a 100755..100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,14 +19,14 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") # Set required packages INCLUDE(FindPkgConfig) - +SET(AUL-1_PKG_CHECK_MODULES dlog ecore libprivilege-control app-checker rua glib-2.0 ecore-input evas vconf pkgmgr-info privacy-manager-client) OPTION(WITH_WAYLAND "Build with wayland" OFF) IF(WITH_WAYLAND) ADD_DEFINITIONS("-DWAYLAND") - pkg_check_modules(pkgs REQUIRED dlog ecore x11 libprivilege-control app-checker rua glib-2.0 ecore-wayland ecore-input evas vconf pkgmgr-info privacy-manager-client) -ELSE() + pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ecore-wayland) +ELSE(WITH_WAYLAND) ADD_DEFINITIONS("-DX11") - pkg_check_modules(pkgs REQUIRED dlog ecore x11 libprivilege-control app-checker rua glib-2.0 ecore-x ecore-input evas vconf pkgmgr-info privacy-manager-client) + pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} x11 ecore-x) ENDIF(WITH_WAYLAND) pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libsmack) @@ -100,10 +100,16 @@ SET_TARGET_PROPERTIES(aul PROPERTIES VERSION ${VERSION}) # launchpad(old avatar) daemon SET(AVATAR_NAME "launchpad_preloading_preinitializing_daemon") +IF (WITH_WAYLAND) +add_executable(${AVATAR_NAME} + launchpad_src/launchpad.c + ) +ELSE(WITH_WAYLAND) add_executable(${AVATAR_NAME} launchpad_src/launchpad.c launchpad_src/util_x.c ) +ENDIF(WITH_WAYLAND) MESSAGE(" "${pkgs_LDFLAGS}) target_link_libraries(${AVATAR_NAME} aul_mods aul ${pkgs_LDFLAGS} ${LIB_DL}) @@ -120,7 +126,12 @@ add_executable(amd am_daemon/amd_launch.c am_daemon/amd_status.c ) -target_link_libraries(amd aul_mods app-checker-server rua glib-2.0 bundle ail aul utilX ${pkgs_LDFLAGS}) +SET(AUL-1_LINK_LIBRARY amd aul_mods app-checker-server rua glib-2.0 bundle ail aul) +IF (WITH_WAYLAND) +target_link_libraries(${AUL-1_LINK_LIBRARY} ${pkgs_LDFLAGS}) +ELSE(WITH_WAYLAND) +target_link_libraries(${AUL-1_LINK_LIBRARY} utilX ${pkgs_LDFLAGS}) +ENDIF(WITH_WAYLAND) SET(REL_AGENT daemon-manager-release-agent) ADD_EXECUTABLE(${REL_AGENT} agent/${REL_AGENT}.c) diff --git a/launchpad_src/launchpad.c b/launchpad_src/launchpad.c index 314ddf9a..565d1637 100755..100644 --- a/launchpad_src/launchpad.c +++ b/launchpad_src/launchpad.c @@ -27,7 +27,9 @@ #include <stdio.h> #include <string.h> #include <dlfcn.h> +#ifdef X11 #include <X11/Xlib.h> +#endif #include <sys/types.h> #include <signal.h> #include <dirent.h> diff --git a/packaging/aul.spec b/packaging/aul.spec index 846eee13..8f80d8fc 100755..100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -1,4 +1,5 @@ %bcond_with wayland +%bcond_with x Name: aul Summary: App utility library @@ -20,7 +21,6 @@ Requires(preun): /usr/bin/systemctl BuildRequires: cmake BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(dlog) @@ -32,11 +32,13 @@ BuildRequires: pkgconfig(app-checker-server) BuildRequires: pkgconfig(rua) %if %{with wayland} BuildRequires: pkgconfig(ecore-wayland) -%else +%endif +%if %{with x} BuildRequires: pkgconfig(ecore-x) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(utilX) %endif BuildRequires: pkgconfig(ecore-input) -BuildRequires: pkgconfig(utilX) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(libsmack) diff --git a/src/key.c b/src/key.c index da44d65f..a94f03c1 100755..100644 --- a/src/key.c +++ b/src/key.c @@ -23,7 +23,9 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#ifdef X11 #include <utilX.h> +#endif #include <glib.h> #include <poll.h> #include <bundle.h> |