-rw-r--r-- | noncore/settings/sound/Makefile.in | 2 | ||||
-rw-r--r-- | noncore/settings/sound/sound.pro | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/sound/Makefile.in b/noncore/settings/sound/Makefile.in index 1772e12..b42f2e9 100644 --- a/noncore/settings/sound/Makefile.in +++ b/noncore/settings/sound/Makefile.in @@ -1,135 +1,135 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) CC = $(SYSCONF_CC) $(QT_C_MT) CFLAGS = $(SYSCONF_CFLAGS) -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) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../bin/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = sound TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = soundsettings.h SOURCES = soundsettings.cpp \ main.cpp OBJECTS = soundsettings.o \ main.o \ soundsettingsbase.o INTERFACES = soundsettingsbase.ui UICDECLS = soundsettingsbase.h UICIMPLS = soundsettingsbase.cpp SRCMOC = moc_soundsettings.cpp \ moc_soundsettingsbase.cpp OBJMOC = moc_soundsettings.o \ moc_soundsettingsbase.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)$(TARGET) $(DESTDIR)$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(SYSCONF_LINK) $(LFLAGS) -o $(DESTDIR)$(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) moc: $(SRCMOC) tmake: tmake sound.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 soundsettings.o: soundsettings.cpp \ soundsettings.h \ soundsettingsbase.h main.o: main.cpp \ soundsettings.h \ soundsettingsbase.h soundsettingsbase.h: soundsettingsbase.ui $(UIC) soundsettingsbase.ui -o $(INTERFACE_DECL_PATH)/soundsettingsbase.h soundsettingsbase.cpp: soundsettingsbase.ui $(UIC) soundsettingsbase.ui -i soundsettingsbase.h -o soundsettingsbase.cpp soundsettingsbase.o: soundsettingsbase.cpp \ soundsettingsbase.h \ soundsettingsbase.ui moc_soundsettings.o: moc_soundsettings.cpp \ soundsettings.h \ soundsettingsbase.h moc_soundsettingsbase.o: moc_soundsettingsbase.cpp \ soundsettingsbase.h moc_soundsettings.cpp: soundsettings.h $(MOC) soundsettings.h -o moc_soundsettings.cpp moc_soundsettingsbase.cpp: soundsettingsbase.h $(MOC) soundsettingsbase.h -o moc_soundsettingsbase.cpp diff --git a/noncore/settings/sound/sound.pro b/noncore/settings/sound/sound.pro index 9028a44..44eff44 100644 --- a/noncore/settings/sound/sound.pro +++ b/noncore/settings/sound/sound.pro @@ -1,10 +1,10 @@ TEMPLATE = app CONFIG += qt warn_on release DESTDIR = ../../bin HEADERS = soundsettings.h SOURCES = soundsettings.cpp main.cpp INTERFACES = soundsettingsbase.ui -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += ../$(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += ../$(OPIEDIR)/include LIBS += -lqpe TARGET = sound |