| -rw-r--r-- | inputmethods/keyboard/Makefile.in | 2 | ||||
| -rw-r--r-- | inputmethods/keyboard/keyboard.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inputmethods/keyboard/Makefile.in b/inputmethods/keyboard/Makefile.in index 3631807..16fdcb7 100644 --- a/inputmethods/keyboard/Makefile.in +++ b/inputmethods/keyboard/Makefile.in @@ -1,57 +1,57 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -INCPATH = -I$(QPEDIR)/include +INCPATH = -I$(OPIEDIR)/include LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/inputmethods/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = qkeyboard TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h \ keyboardimpl.h SOURCES = keyboard.cpp \ ../pickboard/pickboardcfg.cpp \ ../pickboard/pickboardpicks.cpp \ keyboardimpl.cpp OBJECTS = keyboard.o \ ../pickboard/pickboardcfg.o \ ../pickboard/pickboardpicks.o \ keyboardimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_keyboard.cpp \ ../pickboard/moc_pickboardcfg.cpp \ ../pickboard/moc_pickboardpicks.cpp OBJMOC = moc_keyboard.o \ ../pickboard/moc_pickboardcfg.o \ ../pickboard/moc_pickboardpicks.o ####### Implicit rules .SUFFIXES: .cpp .cxx .cc .C .c .cpp.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .cxx.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< diff --git a/inputmethods/keyboard/keyboard.pro b/inputmethods/keyboard/keyboard.pro index 87c838e..6e9df79 100644 --- a/inputmethods/keyboard/keyboard.pro +++ b/inputmethods/keyboard/keyboard.pro @@ -1,18 +1,18 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = keyboard.h \ ../pickboard/pickboardcfg.h \ ../pickboard/pickboardpicks.h \ keyboardimpl.h SOURCES = keyboard.cpp \ ../pickboard/pickboardcfg.cpp \ ../pickboard/pickboardpicks.cpp \ keyboardimpl.cpp TARGET = qkeyboard DESTDIR = ../../plugins/inputmethods -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include ../../taskbar +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include ../../taskbar LIBS += -lqpe VERSION = 1.0.0 TRANSLATIONS += ../../i18n/de/libqkeyboard.ts |