Changeset 45 for tools/ddd


Ignore:
Timestamp:
05/20/09 10:22:43 (16 years ago)
Author:
ogrimm
Message:
Modified ddd.pro to automatically bind in qwt
Location:
tools/ddd
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • tools/ddd/Makefile

    r30 r45  
    11#############################################################################
    22# Makefile for building: ddd
    3 # Generated by qmake (2.01a) (Qt 4.4.3) on: Tue Mar 24 08:02:04 2009
     3# Generated by qmake (2.01a) (Qt 4.4.3) on: Wed May 20 11:20:39 2009
    44# Project:  ddd.pro
    55# Template: app
    … …  
    1717LINK          = g++
    1818LFLAGS        = -Wl,-rpath,/usr/local/Trolltech/Qt-4.4.3/lib
    19 LIBS          = $(SUBLIBS) -L/usr/local/qwt-5.2.0/lib -lqwt -L/usr/local/Trolltech/Qt-4.4.3/lib -lQtGui -L/usr/local/Trolltech/Qt-4.4.3/lib -L/usr/X11R6/lib -pthread -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lfreetype -lfontconfig -lXext -lX11 -lQtNetwork -pthread -pthread -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread
     19LIBS          = $(SUBLIBS)  -L/usr/local/Trolltech/Qt-4.4.3/lib -L/usr/local/qwt-5.2.0/lib -lqwt -lQtGui -L/usr/local/Trolltech/Qt-4.4.3/lib -L/usr/X11R6/lib -pthread -lpng -lSM -lICE -pthread -pthread -lXi -lXrender -lXrandr -lfreetype -lfontconfig -lXext -lX11 -lQtNetwork -pthread -pthread -lQtCore -lz -lm -pthread -lgthread-2.0 -lrt -lglib-2.0 -ldl -lpthread
    2020AR            = ar cqs
    2121RANLIB        =
    … …  
    4545SOURCES       = Functions.cpp \
    4646                GUI.cpp \
    47                 ../../pixelmap\Pixel.cc \
    48                 ../../pixelmap\PixelMap.cc \
    49                 ../../drsdaq/RawDataCTX.cc \
    50                 moc_GUI.cpp
     47                ../../pixelmap/Pixel.cc \
     48                ../../pixelmap/PixelMap.cc \
     49                ../../drsdaq/RawDataCTX.cc moc_GUI.cpp
    5150OBJECTS       = Functions.o \
    5251                GUI.o \
    53                 ../../pixelmap/Pixel.o \
    54                 ../../pixelmap/PixelMap.o \
    55                 ../../drsdaq/RawDataCTX.o \
     52                Pixel.o \
     53                PixelMap.o \
     54                RawDataCTX.o \
    5655                moc_GUI.o
    5756DIST          = /usr/local/Trolltech/Qt-4.4.3/mkspecs/common/g++.conf \
    … …  
    153152dist:
    154153        @$(CHK_DIR_EXISTS) .tmp/ddd1.0.0 || $(MKDIR) .tmp/ddd1.0.0
    155         $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ddd1.0.0/ && $(COPY_FILE) --parents GUI.h Pixel.h PixelMap.h RawDataCTX.h .tmp/ddd1.0.0/ && $(COPY_FILE) --parents Functions.cpp GUI.cpp Pixel.cc PixelMap.cc RawDataCTX.cc .tmp/ddd1.0.0/ && (cd `dirname .tmp/ddd1.0.0` && $(TAR) ddd1.0.0.tar ddd1.0.0 && $(COMPRESS) ddd1.0.0.tar) && $(MOVE) `dirname .tmp/ddd1.0.0`/ddd1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ddd1.0.0
     154        $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/ddd1.0.0/ && $(COPY_FILE) --parents GUI.h ../../pixelmap/Pixel.h ../../pixelmap/PixelMap.h ../../drsdaq/RawDataCTX.h .tmp/ddd1.0.0/ && $(COPY_FILE) --parents Functions.cpp GUI.cpp ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.cc ../../drsdaq/RawDataCTX.cc .tmp/ddd1.0.0/ && (cd `dirname .tmp/ddd1.0.0` && $(TAR) ddd1.0.0.tar ddd1.0.0 && $(COMPRESS) ddd1.0.0.tar) && $(MOVE) `dirname .tmp/ddd1.0.0`/ddd1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/ddd1.0.0
    156155
    157156
    … …  
    212211        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o GUI.o GUI.cpp
    213212
    214 Pixel.o: ../../Pixel.cc ../../PixelMap.h \
    215                 ../../Pixel.h
    216         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Pixel.o Pixel.cc
    217 
    218 PixelMap.o: ../../pixelmap/PixelMap.cc ../../PixelMap.h \
    219                 ../../Pixel.h
    220         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o PixelMap.o PixelMap.cc
     213Pixel.o: ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.h \
     214                ../../pixelmap/Pixel.h
     215        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Pixel.o ../../pixelmap/Pixel.cc
     216
     217PixelMap.o: ../../pixelmap/PixelMap.cc ../../pixelmap/PixelMap.h \
     218                ../../pixelmap/Pixel.h
     219        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o PixelMap.o ../../pixelmap/PixelMap.cc
    221220
    222221RawDataCTX.o: ../../drsdaq/RawDataCTX.cc ../../drsdaq/RawDataCTX.h
    223         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o RawDataCTX.o RawDataCTX.cc
     222        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o RawDataCTX.o ../../drsdaq/RawDataCTX.cc
    224223
    225224moc_GUI.o: moc_GUI.cpp

  • tools/ddd/ddd.pro

    r29 r45  
    66TARGET =
    77DEPENDPATH += .
    8 INCLUDEPATH += . /usr/local/qwt-5.1.1/include
     8INCLUDEPATH += . /usr/local/qwt-5.2.0/include
    99
    1010# Input
    11 HEADERS += GUI.h Pixel.h PixelMap.h RawDataCTX.h
    12 SOURCES += Functions.cpp GUI.cpp Pixel.cc PixelMap.cc RawDataCTX.cc
    13 
     11HEADERS += GUI.h ../../pixelmap/Pixel.h ../../pixelmap/PixelMap.h ../../drsdaq/RawDataCTX.h
     12SOURCES += Functions.cpp GUI.cpp ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.cc ../../drsdaq/RawDataCTX.cc
     13LIBS += -L/usr/local/qwt-5.2.0/lib -lqwt
    1414QT += network
Note: See TracChangeset for help on using the changeset viewer.