Changeset 45 for tools

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:

• Makefile (modified) (5 diffs)
• ddd.pro (modified) (1 diff)

tools/ddd/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: ddd
-# Generated by qmake (2.01a) (Qt 4.4.3) on: Tue Mar 24 08:02:04 2009
+# Generated by qmake (2.01a) (Qt 4.4.3) on: Wed May 20 11:20:39 2009
 # Project:  ddd.pro
 # Template: app
@@ -17 +17 @@
 LINK          = g++
 LFLAGS        = -Wl,-rpath,/usr/local/Trolltech/Qt-4.4.3/lib
-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
+LIBS          = $(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
 AR            = ar cqs
 RANLIB        = 
@@ -45 +45 @@
 SOURCES       = Functions.cpp \
                 GUI.cpp \
-                ../../pixelmap\Pixel.cc \
-                ../../pixelmap\PixelMap.cc \
-                ../../drsdaq/RawDataCTX.cc \
-                moc_GUI.cpp
+                ../../pixelmap/Pixel.cc \
+                ../../pixelmap/PixelMap.cc \
+                ../../drsdaq/RawDataCTX.cc moc_GUI.cpp
 OBJECTS       = Functions.o \
                 GUI.o \
-                ../../pixelmap/Pixel.o \
-                ../../pixelmap/PixelMap.o \
-                ../../drsdaq/RawDataCTX.o \
+                Pixel.o \
+                PixelMap.o \
+                RawDataCTX.o \
                 moc_GUI.o
 DIST          = /usr/local/Trolltech/Qt-4.4.3/mkspecs/common/g++.conf \
@@ -153 +152 @@
 dist: 
         @$(CHK_DIR_EXISTS) .tmp/ddd1.0.0 || $(MKDIR) .tmp/ddd1.0.0 
-        $(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
+        $(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
 
 
@@ -212 +211 @@
         $(CXX) -c $(CXXFLAGS) $(INCPATH) -o GUI.o GUI.cpp
 
-Pixel.o: ../../Pixel.cc ../../PixelMap.h \
-                ../../Pixel.h
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Pixel.o Pixel.cc
-
-PixelMap.o: ../../pixelmap/PixelMap.cc ../../PixelMap.h \
-                ../../Pixel.h
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o PixelMap.o PixelMap.cc
+Pixel.o: ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.h \
+                ../../pixelmap/Pixel.h
+        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o Pixel.o ../../pixelmap/Pixel.cc
+
+PixelMap.o: ../../pixelmap/PixelMap.cc ../../pixelmap/PixelMap.h \
+                ../../pixelmap/Pixel.h
+        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o PixelMap.o ../../pixelmap/PixelMap.cc
 
 RawDataCTX.o: ../../drsdaq/RawDataCTX.cc ../../drsdaq/RawDataCTX.h
-        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o RawDataCTX.o RawDataCTX.cc
+        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o RawDataCTX.o ../../drsdaq/RawDataCTX.cc
 
 moc_GUI.o: moc_GUI.cpp 

tools/ddd/ddd.pro

@@ -6 +6 @@
 TARGET = 
 DEPENDPATH += .
-INCLUDEPATH += . /usr/local/qwt-5.1.1/include
+INCLUDEPATH += . /usr/local/qwt-5.2.0/include
 
 # Input
-HEADERS += GUI.h Pixel.h PixelMap.h RawDataCTX.h
-SOURCES += Functions.cpp GUI.cpp Pixel.cc PixelMap.cc RawDataCTX.cc
-
+HEADERS += GUI.h ../../pixelmap/Pixel.h ../../pixelmap/PixelMap.h ../../drsdaq/RawDataCTX.h
+SOURCES += Functions.cpp GUI.cpp ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.cc ../../drsdaq/RawDataCTX.cc
+LIBS += -L/usr/local/qwt-5.2.0/lib -lqwt
 QT += network