Fix inadvertent tq changes.

(cherry picked from commit 9cff029f56)
v3.5.13-sru
Darrell Anderson 12 years ago committed by Slávek Banko
parent b59d8a0d7e
commit ecd24e4f3c

@ -1,14 +1,14 @@
DEFINES=-DTEST_APP -D_REENTRANT_ -DQT_THREAD_SUPPORT DEFINES=-DTEST_APP -D_REENTRANT_ -DQT_THREAD_SUPPORT
CXX=g++ CXX=g++
TQMOC=/usr/lib/qt-3.3/bin/moc MOC=/usr/lib/qt-3.3/bin/moc
CXXFLAGS=-g -fpic -pipe -Wall -Wreturn-type -fno-exceptions --permissive -fno-rtti -Wno-ctor-dtor-privacy -march=pentium -mcpu=pentium -O2 $(INCLUDES) $(DEFINES) CXXFLAGS=-g -fpic -pipe -Wall -Wreturn-type -fno-exceptions --permissive -fno-rtti -Wno-ctor-dtor-privacy -march=pentium -mcpu=pentium -O2 $(INCLUDES) $(DEFINES)
SRCS=main.cpp hxsplay.cpp SRCS=main.cpp hxsplay.cpp
LIBSRCS=helix-engine.cpp helix-config.cpp hxsplay.cpp LIBSRCS=helix-engine.cpp helix-config.cpp hxsplay.cpp
TQMOCSRCS=helix-engine.moc helix-config.moc MOCSRCS=helix-engine.moc helix-config.moc
TQMOCHDRS=$(TQMOCSRCS:.moc=.h) MOCHDRS=$(MOCSRCS:.moc=.h)
OBJS=$(SRCS:.cpp=.o) OBJS=$(SRCS:.cpp=.o)
LIBOBJS=$(LIBSRCS:.cpp=.o) LIBOBJS=$(LIBSRCS:.cpp=.o)
@ -39,13 +39,13 @@ LIBRARIES=-Lhelix-sp -lhelix-sp --lstdc++ -ldl -lm -L/usr/lib/qt-3.3/lib -lqt-mt
$(CXX) $(CXXFLAGS) -o $@ -c $< $(CXX) $(CXXFLAGS) -o $@ -c $<
.h.moc: .h.moc:
$(TQMOC) $< -o $@ $(MOC) $< -o $@
PROGRAM=splay PROGRAM=splay
SLIBRARY=libamarok_helixengine_plugin.so SLIBRARY=libamarok_helixengine_plugin.so
all: $(TQMOCSRCS) $(SLIBRARY) $(OBJS) $(LIBOBJS) $(PROGRAM) all: $(MOCSRCS) $(SLIBRARY) $(OBJS) $(LIBOBJS) $(PROGRAM)
$(PROGRAM): $(OBJS) $(PROGRAM): $(OBJS)
$(CXX) -o $(PROGRAM) $(OBJS) $(LIBRARIES) $(CXX) -o $(PROGRAM) $(OBJS) $(LIBRARIES)
@ -55,7 +55,7 @@ $(SLIBRARY): $(LIBOBJS)
$(OBJS): $(SRCS) $(OBJS): $(SRCS)
$(TQMOCSRCS): $(TQMOCHDRS) $(MOCSRCS): $(MOCHDRS)
install: install:
install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY) install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY)

Loading…
Cancel
Save