author | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
commit | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (side-by-side diff) | |
tree | 44f49bdc076dc299bba1a4dc8d5d517114be5701 /core/multimedia/opieplayer/libmad | |
parent | 77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff) | |
download | opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2 |
Committing in .
Modified Files:
configure mkipks addressbook/Makefile.in
addressbook/addressbook.pro calc2/calc.pro
calc2/binary/binary.pro calc2/simple/simple.pro
calculator/Makefile.in calculator/calculator.pro
cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
clock/clock.pro datebook/Makefile.in datebook/datebook.pro
dictionary/dictionary.pro doc/qcop.doc doc/start.doc
embeddedkonsole/Makefile.in
embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
filebrowser/Makefile.in filebrowser/filebrowser.pro
freetype/freetype.pro go/Makefile.in go/go.pro
helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
inputmethods/handwriting/Makefile.in
inputmethods/handwriting/handwriting.pro
inputmethods/keyboard/Makefile.in
inputmethods/keyboard/keyboard.pro
inputmethods/pickboard/Makefile.in
inputmethods/pickboard/pickboard.pro
inputmethods/unikeyboard/Makefile.in
inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
keypebble/keypebble.pro library/Makefile.in library/global.cpp
library/library.pro library/qpeapplication.cpp
mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
minesweep/Makefile.in minesweep/minesweep.pro
mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
mpegplayer/libmpeg3/libmpeg3.pro
mpegplayer/libmpeg3/audio/Makefile
mpegplayer/libmpeg3/video/Makefile
mpegplayer/wavplugin/Makefile.in
mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
netsetup/README netsetup/netsetup.pro
netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
netsetup/lan/Makefile.in netsetup/lan/lan.pro
parashoot/Makefile.in parashoot/parashoot.pro
qasteroids/Makefile.in qasteroids/qasteroids.pro
qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
qipkg/qipkg.pro scripts/q_functions
settings/appearance/Makefile.in
settings/appearance/appearance.pro
settings/language/Makefile.in settings/language/language.pro
settings/light-and-power/Makefile.in
settings/light-and-power/light-and-power.pro
settings/rotation/Makefile.in settings/rotation/rotation.pro
settings/security/Makefile.in settings/security/security.pro
settings/sound/Makefile.in settings/sound/sound.pro
settings/systemtime/Makefile.in
settings/systemtime/systemtime.pro showimg/Makefile.in
showimg/showimg.pro single/Makefile.in single/single.pro
snake/Makefile.in snake/snake.pro solitaire/Makefile.in
solitaire/solitaire.pro spreadsheet/Makefile.in
spreadsheet/spreadsheet.pro sysinfo/Makefile.in
sysinfo/sysinfo.pro tableviewer/tableviewer.pro
taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
taskbar/batteryapplet/Makefile.in
taskbar/batteryapplet/batteryapplet.pro
taskbar/clipboardapplet/clipboardapplet.pro
taskbar/clockapplet/Makefile.in
taskbar/clockapplet/clockapplet.pro
taskbar/netmonapplet/Makefile.in
taskbar/netmonapplet/netmonapplet.pro
taskbar/volumeapplet/Makefile.in
taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
website/htdocs/build.html website/htdocs/development.html
website/htdocs/refman/qcop.html
website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
wordgame/wordgame.pro
Log Message:
Changed QPEDIR to OPIEDIR in .pro files, and documentation,
and regenerated all Makefile.in's that were affected.
Diffstat (limited to 'core/multimedia/opieplayer/libmad') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/libmad/Makefile.in | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in index 9e17769..19ded26 100644 --- a/core/multimedia/opieplayer/libmad/Makefile.in +++ b/core/multimedia/opieplayer/libmad/Makefile.in @@ -1,105 +1,105 @@ ############################################################################# ####### Compiler, tools and options CXX = $(SYSCONF_CXX) $(QT_CXX_MT) -CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" +CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) CC = $(SYSCONF_CC) $(QT_C_MT) -CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" -INCPATH = -I$(QPEDIR)/include -I.. +CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) +INCPATH = -I$(OPIEDIR)/include -I.. LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) LIBS = $(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) MOC = $(SYSCONF_MOC) UIC = $(SYSCONF_UIC) ####### Target DESTDIR = ../../plugins/codecs/ VER_MAJ = 1 VER_MIN = 0 VER_PATCH = 0 TARGET = madplugin TARGET1 = lib$(TARGET).so.$(VER_MAJ) ####### Files HEADERS = libmad_version.h \ fixed.h \ bit.h \ timer.h \ stream.h \ frame.h \ synth.h \ decoder.h \ layer12.h \ layer3.h \ huffman.h \ libmad_global.h \ mad.h \ libmadplugin.h \ libmadpluginimpl.h SOURCES = version.c \ fixed.c \ bit.c \ timer.c \ stream.c \ frame.c \ synth.c \ decoder.c \ layer12.c \ layer3.c \ huffman.c \ libmadplugin.cpp \ libmadpluginimpl.cpp OBJECTS = version.o \ fixed.o \ bit.o \ timer.o \ stream.o \ frame.o \ synth.o \ decoder.o \ layer12.o \ layer3.o \ huffman.o \ libmadplugin.o \ libmadpluginimpl.o INTERFACES = UICDECLS = UICIMPLS = SRCMOC = OBJMOC = ####### 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 libmad.pro diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index e3f75b7..6c40a15 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro @@ -1,12 +1,12 @@ TEMPLATE = lib CONFIG += qt warn_on release HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp TARGET = madplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lm VERSION = 1.0.0 |