Changeset 28383 for trunk/magic

Timestamp:

Jun 16, 2010, 8:53:51 PM (16 years ago)

Author:

eugene

Message:

deactivate automatic qt build; point verify streaks at qtlib in ipp home directory

Location:

trunk/magic

Files:

• Makefile (modified) (1 diff)
• verify/Makefile (modified) (2 diffs)

trunk/magic/Makefile

@@ -24 +24 @@
         tar xvzf $(MAGIC_DIR)/magic.tgz
         tar xvzf $(MAGIC_DIR)/ssa-core-cpp.tgz
-        tar xvzf $(QTSRC)
         cp Makefile.magic magic/Makefile.magic
         cp magic/VerifyStreaks/main.cpp verify/VerifyStreaks.cpp
+
+# tar xvzf $(QTSRC)
 
 qt-everywhere: $(QTDIR)/lib/libQtCore.so

trunk/magic/verify/Makefile

@@ -4 +4 @@
 CXXFLAGS = -W -Wall -O3 -DNDEBUG
 # CXXFLAGS = -W -Wall -g
+
+QTLIB_INC = /home/panstarrs/ipp/src/qtlib/include
+QTLIB_LIB = /home/panstarrs/ipp/src/qtlib/lib
 
 SSA_SRC = ../ssa-core-cpp/src
@@ -12 +15 @@
 PSINC_DIR = $(PSCONFDIR)/$(PSCONFIG)/include
 
-CINC = -I. -I$(SSA_SRC) -I$(PSINC_DIR) -I$(MAGIC_SRC)
-CLIB = -L. -L$(SSA_LIB) -I$(PSINC_DIR) -lcfitsio -lSSA -lQtCore -lQtGui
+CINC = -I. -I$(QTLIB_INC) -I$(SSA_SRC) -I$(PSINC_DIR) -I$(MAGIC_SRC)
+CLIB = -L. -L$(QTLIB_LIB) -L$(SSA_LIB) -I$(PSINC_DIR) -lcfitsio -lSSA -lQtCore -lQtGui
 
 all : $(TARGETS)