diff --git a/plugins/import/ImportTCX/Import.pro.user b/plugins/import/ImportTCX/Import.pro.user index 0c59519..3636f71 100644 --- a/plugins/import/ImportTCX/Import.pro.user +++ b/plugins/import/ImportTCX/Import.pro.user @@ -16,7 +16,7 @@ Desktop Qt4ProjectManager.Target.DesktopTarget - 1 + 0 0 0 @@ -36,7 +36,19 @@ - 2 + + + $BUILDDIR/libImportTCX.so.1.0.0 + $BUILDDIR/../../../bin/ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + 3 Build ProjectExplorer.BuildSteps.Build @@ -86,7 +98,19 @@ - 2 + + + $BUILDDIR/libImportTCX.so.1.0.0 + $BUILDDIR/../../../bin/ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + 3 Build ProjectExplorer.BuildSteps.Build diff --git a/plugins/import/ImportTCX/Makefile b/plugins/import/ImportTCX/Makefile deleted file mode 100644 index 935cd1c..0000000 --- a/plugins/import/ImportTCX/Makefile +++ /dev/null @@ -1,275 +0,0 @@ -############################################################################# -# Makefile for building: libImportTCX.so.1.0.0 -# Generated by qmake (2.01a) (Qt 4.7.2) on: Wed Apr 27 13:38:05 2011 -# Project: Import.pro -# Template: lib -# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Import.pro -############################################################################# - -####### Compiler, tools and options - -CC = gcc -CXX = g++ -DEFINES = -DIMPORT_LIBRARY -DQT_NO_DEBUG -DQT_XMLPATTERNS_LIB -DQT_XML_LIB -DQT_CORE_LIB -DQT_SHARED -CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtXmlPatterns -I/usr/include/qt4 -I. -LINK = g++ -LFLAGS = -Wl,-O1 -shared -Wl,-soname,libImportTCX.so.1 -LIBS = $(SUBLIBS) -L/usr/lib -shared -fPIC -lQtXmlPatterns -lQtXml -lQtCore -lpthread -AR = ar cqs -RANLIB = -QMAKE = /usr/bin/qmake-qt4 -TAR = tar -cf -COMPRESS = gzip -9f -COPY = cp -f -SED = sed -COPY_FILE = $(COPY) -COPY_DIR = $(COPY) -r -STRIP = strip -INSTALL_FILE = install -m 644 -p -INSTALL_DIR = $(COPY_DIR) -INSTALL_PROGRAM = install -m 755 -p -DEL_FILE = rm -f -SYMLINK = ln -f -s -DEL_DIR = rmdir -MOVE = mv -f -CHK_DIR_EXISTS= test -d -MKDIR = mkdir -p - -####### Output directory - -OBJECTS_DIR = ./ - -####### Files - -SOURCES = cimport.cpp \ - cactivity.cpp \ - clap.cpp \ - ctrackpoint.cpp \ - cposition.cpp -OBJECTS = cimport.o \ - cactivity.o \ - clap.o \ - ctrackpoint.o \ - cposition.o -DIST = /usr/share/qt4/mkspecs/common/g++.conf \ - /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/modules/qt_phonon.pri \ - /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/release.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - Import.pro -QMAKE_TARGET = ImportTCX -DESTDIR = -TARGET = libImportTCX.so.1.0.0 -TARGETA = libImportTCX.a -TARGETD = libImportTCX.so.1.0.0 -TARGET0 = libImportTCX.so -TARGET1 = libImportTCX.so.1 -TARGET2 = libImportTCX.so.1.0 - -first: all -####### Implicit rules - -.SUFFIXES: .o .c .cpp .cc .cxx .C - -.cpp.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cc.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.cxx.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.C.o: - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" - -.c.o: - $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" - -####### Build rules - -all: Makefile $(TARGET) - -$(TARGET): $(OBJECTS) $(SUBLIBS) $(OBJCOMP) - -$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) - $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP) - -ln -s $(TARGET) $(TARGET0) - -ln -s $(TARGET) $(TARGET1) - -ln -s $(TARGET) $(TARGET2) - - - -staticlib: $(TARGETA) - -$(TARGETA): $(OBJECTS) $(OBJCOMP) - -$(DEL_FILE) $(TARGETA) - $(AR) $(TARGETA) $(OBJECTS) - -Makefile: Import.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ - /usr/share/qt4/mkspecs/common/unix.conf \ - /usr/share/qt4/mkspecs/common/linux.conf \ - /usr/share/qt4/mkspecs/qconfig.pri \ - /usr/share/qt4/mkspecs/modules/qt_phonon.pri \ - /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \ - /usr/share/qt4/mkspecs/features/qt_functions.prf \ - /usr/share/qt4/mkspecs/features/qt_config.prf \ - /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ - /usr/share/qt4/mkspecs/features/default_pre.prf \ - /usr/share/qt4/mkspecs/features/release.prf \ - /usr/share/qt4/mkspecs/features/default_post.prf \ - /usr/share/qt4/mkspecs/features/warn_on.prf \ - /usr/share/qt4/mkspecs/features/qt.prf \ - /usr/share/qt4/mkspecs/features/unix/thread.prf \ - /usr/share/qt4/mkspecs/features/moc.prf \ - /usr/share/qt4/mkspecs/features/resources.prf \ - /usr/share/qt4/mkspecs/features/uic.prf \ - /usr/share/qt4/mkspecs/features/yacc.prf \ - /usr/share/qt4/mkspecs/features/lex.prf \ - /usr/share/qt4/mkspecs/features/include_source_dir.prf \ - /usr/lib/libQtXmlPatterns.prl \ - /usr/lib/libQtXml.prl \ - /usr/lib/libQtCore.prl - $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Import.pro -/usr/share/qt4/mkspecs/common/g++.conf: -/usr/share/qt4/mkspecs/common/unix.conf: -/usr/share/qt4/mkspecs/common/linux.conf: -/usr/share/qt4/mkspecs/qconfig.pri: -/usr/share/qt4/mkspecs/modules/qt_phonon.pri: -/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri: -/usr/share/qt4/mkspecs/features/qt_functions.prf: -/usr/share/qt4/mkspecs/features/qt_config.prf: -/usr/share/qt4/mkspecs/features/exclusive_builds.prf: -/usr/share/qt4/mkspecs/features/default_pre.prf: -/usr/share/qt4/mkspecs/features/release.prf: -/usr/share/qt4/mkspecs/features/default_post.prf: -/usr/share/qt4/mkspecs/features/warn_on.prf: -/usr/share/qt4/mkspecs/features/qt.prf: -/usr/share/qt4/mkspecs/features/unix/thread.prf: -/usr/share/qt4/mkspecs/features/moc.prf: -/usr/share/qt4/mkspecs/features/resources.prf: -/usr/share/qt4/mkspecs/features/uic.prf: -/usr/share/qt4/mkspecs/features/yacc.prf: -/usr/share/qt4/mkspecs/features/lex.prf: -/usr/share/qt4/mkspecs/features/include_source_dir.prf: -/usr/lib/libQtXmlPatterns.prl: -/usr/lib/libQtXml.prl: -/usr/lib/libQtCore.prl: -qmake: FORCE - @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ QMLJSDEBUGGER_PATH=/usr/share/qtcreator/qml/qmljsdebugger -o Makefile Import.pro - -dist: - @$(CHK_DIR_EXISTS) .tmp/ImportTCX1.0.0 || $(MKDIR) .tmp/ImportTCX1.0.0 - $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ImportTCX1.0.0/ && $(COPY_FILE) --parents cimport.h Import_global.h cactivity.h clap.h common.h ctrackpoint.h cposition.h .tmp/ImportTCX1.0.0/ && $(COPY_FILE) --parents cimport.cpp cactivity.cpp clap.cpp ctrackpoint.cpp cposition.cpp .tmp/ImportTCX1.0.0/ && (cd `dirname .tmp/ImportTCX1.0.0` && $(TAR) ImportTCX1.0.0.tar ImportTCX1.0.0 && $(COMPRESS) ImportTCX1.0.0.tar) && $(MOVE) `dirname .tmp/ImportTCX1.0.0`/ImportTCX1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ImportTCX1.0.0 - - -clean:compiler_clean - -$(DEL_FILE) $(OBJECTS) - -$(DEL_FILE) *~ core *.core - - -####### Sub-libraries - -distclean: clean - -$(DEL_FILE) $(TARGET) - -$(DEL_FILE) $(TARGET0) $(TARGET1) $(TARGET2) $(TARGETA) - -$(DEL_FILE) Makefile - - -check: first - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: -compiler_moc_header_clean: -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: - -####### Compile - -cimport.o: cimport.cpp cimport.h \ - cactivity.h \ - common.h \ - clap.h \ - ctrackpoint.h \ - cposition.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cimport.o cimport.cpp - -cactivity.o: cactivity.cpp cactivity.h \ - common.h \ - clap.h \ - ctrackpoint.h \ - cposition.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cactivity.o cactivity.cpp - -clap.o: clap.cpp clap.h \ - common.h \ - ctrackpoint.h \ - cposition.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o clap.o clap.cpp - -ctrackpoint.o: ctrackpoint.cpp ctrackpoint.h \ - common.h \ - cposition.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o ctrackpoint.o ctrackpoint.cpp - -cposition.o: cposition.cpp cposition.h - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cposition.o cposition.cpp - -####### Install - -install_target: first FORCE - @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/lib/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/lib/ - -$(INSTALL_PROGRAM) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET)" - -$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/usr/local/lib/$(TARGET)" - -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET0)" - -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET1)" - -$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/usr/local/lib/$(TARGET2)" - -uninstall_target: FORCE - -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET)" - -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET0)" - -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET1)" - -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/lib/$(TARGET2)" - -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/lib/ - - -install: install_target FORCE - -uninstall: uninstall_target FORCE - -FORCE: - diff --git a/qtTrainingChart.pro.user b/qtTrainingChart.pro.user index 0db84eb..de1e41d 100644 --- a/qtTrainingChart.pro.user +++ b/qtTrainingChart.pro.user @@ -36,7 +36,43 @@ - 2 + + + $BUILDDIR/qtTrainingChart + $BUILDDIR/bin/ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + + + $BUILDDIR/libImportTCX.so + $BUILDDIR/../../../ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + + + $BUILDDIR/qtTrainingChart + $BUILDDIR/bin/ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + 5 Build ProjectExplorer.BuildSteps.Build @@ -86,7 +122,31 @@ - 2 + + + $BUILDDIR/qtTrainingChart + $BUILDDIR/bin/ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + + + $BUILDDIR/qtTrainingChart + $BUILDDIR/bin/ + + cp + true + $BUILDDIR + Custom Process Step + + ProjectExplorer.ProcessStep + + 4 Build ProjectExplorer.BuildSteps.Build @@ -114,7 +174,7 @@ Qt4ProjectManager.Qt4BuildConfiguration 0 - /data/Projects/QTCreator/TrainingChart/qtTrainingChart-build-desktop + /data/Projects/QTCreator/TrainingChart/qtTrainingChart/bin 2 0 false