diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 17:24:57 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-29 04:20:17 +0100 |
| commit | ecd24e4f3ccb1bc1031128322c140bc85443ad96 (patch) | |
| tree | 9460ab227ebd9a62059b7c039171e54c5196b34d | |
| parent | b59d8a0d7ea3e9d963898d2cc7437fb3fd821176 (diff) | |
| download | amarok-ecd24e4f3ccb1bc1031128322c140bc85443ad96.tar.gz amarok-ecd24e4f3ccb1bc1031128322c140bc85443ad96.zip | |
Fix inadvertent tq changes.
(cherry picked from commit 9cff029f565854c5da2e334d886399b930292c06)
| -rw-r--r-- | amarok/src/engine/helix/Makefile.test | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test index 64c8d27e..84e545cb 100644 --- a/amarok/src/engine/helix/Makefile.test +++ b/amarok/src/engine/helix/Makefile.test @@ -1,14 +1,14 @@ DEFINES=-DTEST_APP -D_REENTRANT_ -DQT_THREAD_SUPPORT 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) SRCS=main.cpp hxsplay.cpp LIBSRCS=helix-engine.cpp helix-config.cpp hxsplay.cpp -TQMOCSRCS=helix-engine.moc helix-config.moc -TQMOCHDRS=$(TQMOCSRCS:.moc=.h) +MOCSRCS=helix-engine.moc helix-config.moc +MOCHDRS=$(MOCSRCS:.moc=.h) OBJS=$(SRCS:.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 $< .h.moc: - $(TQMOC) $< -o $@ + $(MOC) $< -o $@ PROGRAM=splay SLIBRARY=libamarok_helixengine_plugin.so -all: $(TQMOCSRCS) $(SLIBRARY) $(OBJS) $(LIBOBJS) $(PROGRAM) +all: $(MOCSRCS) $(SLIBRARY) $(OBJS) $(LIBOBJS) $(PROGRAM) $(PROGRAM): $(OBJS) $(CXX) -o $(PROGRAM) $(OBJS) $(LIBRARIES) @@ -55,7 +55,7 @@ $(SLIBRARY): $(LIBOBJS) $(OBJS): $(SRCS) -$(TQMOCSRCS): $(TQMOCHDRS) +$(MOCSRCS): $(MOCHDRS) install: install -p -C -m 755 $(SLIBRARY) /usr/lib/trinity/$(SLIBRARY) |