diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 38 |
2 files changed, 4 insertions, 40 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82c1669..6df8e96 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,6 +4,8 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} + ${X11_XTest_INCLUDE_PATH} ) link_directories( @@ -27,7 +29,7 @@ tde_add_executable( ${PROJECT_NAME} AUTOMOC tdecore-shared tdeui-shared tdeio-shared - Xtst + ${X11_XTest_LIB} DESTINATION ${BIN_INSTALL_DIR} ) @@ -47,5 +49,5 @@ install( install( FILES ${PROJECT_NAME}.desktop - DESTINATION ${APPS_INSTALL_DIR}/Utilities + DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 8287a43..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = DragWidget.h MainWidget.h VButton.h numpadvbutton.h - -# let automoc handle all of the meta source files (moc) - -messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kvkbd.pot - -KDE_ICON = kvkbd - -######################################################################### -# APPLICATION SECTION -######################################################################### -# this is the program that gets installed. it's name is used for all -# of the other Makefile.am variables -bin_PROGRAMS = kvkbd - -# the application source, library search path, and link libraries -kvkbd_SOURCES = DragWidget.cpp MainWidget.cpp VButton.cpp main.cpp \ - numpadvbutton.cpp resizabledragwidget.cpp resizabledragwidget.h -kvkbd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kvkbd_LDADD = -lXtst $(LIB_TDEUI) - -# this is where the desktop file will go -shelldesktopdir = $(kde_appsdir)/Utilities -shelldesktop_DATA = kvkbd.desktop - -# this is where the shell's XML-GUI resource file goes -shellrcdir = $(kde_datadir)/kvkbd - -picsdir = $(kde_datadir)/kvkbd/pics -picsdir_DATA = dock.png tray.png -picsdirdir = $(kde_datadir)/kvkbd/pics -METASOURCES = AUTO |