| -rw-r--r-- | inputmethods/pickboard/Makefile.in | 2 | ||||
| -rw-r--r-- | inputmethods/pickboard/pickboard.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inputmethods/pickboard/Makefile.in b/inputmethods/pickboard/Makefile.in index d72e82d..44310a4 100644 --- a/inputmethods/pickboard/Makefile.in +++ b/inputmethods/pickboard/Makefile.in @@ -1,147 +1,147 @@ ############################################################################# ####### 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 = qpickboard TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = pickboard.h \ pickboardcfg.h \ pickboardimpl.h \ pickboardpicks.h SOURCES = pickboard.cpp \ pickboardcfg.cpp \ pickboardimpl.cpp \ pickboardpicks.cpp OBJECTS = pickboard.o \ pickboardcfg.o \ pickboardimpl.o \ pickboardpicks.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = moc_pickboard.cpp \ moc_pickboardcfg.cpp \ moc_pickboardpicks.cpp OBJMOC = moc_pickboard.o \ moc_pickboardcfg.o \ 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 $@ $< .cc.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .C.o: $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< .c.o: $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< ####### Build rules all: $(DESTDIR)$(SYSCONF_LINK_TARGET) $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK_LIB) moc: $(SRCMOC) tmake: tmake pickboard.pro clean: -rm -f $(OBJECTS) $(OBJMOC) $(SRCMOC) $(UICIMPLS) $(UICDECLS) -rm -f *~ core -rm -f allmoc.cpp ####### Extension Modules listpromodules: @echo listallmodules: @echo listaddonpromodules: @echo listaddonentmodules: @echo REQUIRES= ####### Sub-libraries ###### Combined headers ####### Compile pickboard.o: pickboard.cpp \ pickboard.h \ pickboardpicks.h \ pickboardcfg.h pickboardcfg.o: pickboardcfg.cpp \ pickboardcfg.h \ pickboardpicks.h pickboardimpl.o: pickboardimpl.cpp \ pickboard.h \ pickboardimpl.h pickboardpicks.o: pickboardpicks.cpp \ pickboardpicks.h \ pickboardcfg.h moc_pickboard.o: moc_pickboard.cpp \ pickboard.h moc_pickboardcfg.o: moc_pickboardcfg.cpp \ pickboardcfg.h moc_pickboardpicks.o: moc_pickboardpicks.cpp \ pickboardpicks.h moc_pickboard.cpp: pickboard.h $(MOC) pickboard.h -o moc_pickboard.cpp moc_pickboardcfg.cpp: pickboardcfg.h $(MOC) pickboardcfg.h -o moc_pickboardcfg.cpp moc_pickboardpicks.cpp: pickboardpicks.h $(MOC) pickboardpicks.h -o moc_pickboardpicks.cpp diff --git a/inputmethods/pickboard/pickboard.pro b/inputmethods/pickboard/pickboard.pro index 50bc342..ad86370 100644 --- a/inputmethods/pickboard/pickboard.pro +++ b/inputmethods/pickboard/pickboard.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = pickboard.h pickboardcfg.h pickboardimpl.h pickboardpicks.h SOURCES = pickboard.cpp pickboardcfg.cpp pickboardimpl.cpp pickboardpicks.cpp TARGET = qpickboard 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/libqpickboard.ts |