1 files changed, 3 insertions, 3 deletions

diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 1817902..9881815 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -1,201 +1,201 @@
 #############################################################################
 
 ####### 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 -lpthread -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= mpeg3plugin
 TARGET1 = lib$(TARGET).so.$(VER_MAJ)
 
 ####### Files
 
         HEADERS =libmpeg3plugin.h \
                 libmpeg3pluginimpl.h
         SOURCES =libmpeg3plugin.cpp \
                 libmpeg3pluginimpl.cpp \
                 bitstream.c \
                 libmpeg3.c \
                 mpeg3atrack.c \
                 mpeg3css.c \
                 mpeg3demux.c \
                 mpeg3io.c \
                 mpeg3title.c \
                 mpeg3vtrack.c \
                 audio/ac3.c \
                 audio/bit_allocation.c \
                 audio/dct.c \
                 audio/exponents.c \
                 audio/header.c \
                 audio/layer2.c \
                 audio/layer3.c \
                 audio/mantissa.c \
                 audio/mpeg3audio.c \
                 audio/pcm.c \
                 audio/synthesizers.c \
                 audio/tables.c \
                 video/getpicture.c \
                 video/headers.c \
                 video/idct.c \
                 video/macroblocks.c \
                 video/mmxtest.c \
                 video/motion.c \
                 video/mpeg3video.c \
                 video/output.c \
                 video/reconstruct.c \
                 video/seek.c \
                 video/slice.c \
                 video/vlc.c
         OBJECTS =libmpeg3plugin.o \
                 libmpeg3pluginimpl.o \
                 bitstream.o \
                 libmpeg3.o \
                 mpeg3atrack.o \
                 mpeg3css.o \
                 mpeg3demux.o \
                 mpeg3io.o \
                 mpeg3title.o \
                 mpeg3vtrack.o \
                 audio/ac3.o \
                 audio/bit_allocation.o \
                 audio/dct.o \
                 audio/exponents.o \
                 audio/header.o \
                 audio/layer2.o \
                 audio/layer3.o \
                 audio/mantissa.o \
                 audio/mpeg3audio.o \
                 audio/pcm.o \
                 audio/synthesizers.o \
                 audio/tables.o \
                 video/getpicture.o \
                 video/headers.o \
                 video/idct.o \
                 video/macroblocks.o \
                 video/mmxtest.o \
                 video/motion.o \
                 video/mpeg3video.o \
                 video/output.o \
                 video/reconstruct.o \
                 video/seek.o \
                 video/slice.o \
                 video/vlc.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 libmpeg3.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
 
 libmpeg3plugin.o: libmpeg3plugin.cpp \
                 libmpeg3plugin.h \
                 libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 mpeg3demux.h \
                 mpeg3title.h \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
                 mpeg3protos.h \
                 ../mediaplayerplugininterface.h
 
 libmpeg3pluginimpl.o: libmpeg3pluginimpl.cpp \
                 libmpeg3plugin.h \
                 libmpeg3.h \
                 mpeg3private.h \
                 mpeg3atrack.h \
                 mpeg3demux.h \
                 mpeg3title.h \
                 mpeg3io.h \
                 mpeg3css.h \
                 mpeg3private.inc \
                 audio/mpeg3audio.h \
                 mpeg3vtrack.h \
                 video/mpeg3video.h \
                 mpeg3protos.h \
                 ../mediaplayerplugininterface.h \
                 libmpeg3pluginimpl.h \
                 ../mediaplayerplugininterface.h
 
 bitstream.o: bitstream.c \
                 mpeg3private.h \