source: trunk/Makefile.in @ 224

Last change on this file since 224 was 224, checked in by Matthew Whiting, 17 years ago
  • Main change is to correct the problem reported in ticket #4, so that the velocity units are correctly dealt with. This entailed:
    • Changing the way wcssptr is called in FitsIO/wcsIO.cc, so that it is called when there is no CUNIT3 keyword, as well as when the type is different to that desired.
    • Changing the way fixUnits() will deal with missing units -- hopefully this will now not occur, and the error message has been changed accordingly.

Other changes include:

  • Making a new file cubes_extended.cc, that has those functions from cubes.cc that require external functions. This enables simpler compilation of test programs.
  • An additional clause in dataIO.cc to set the null value when the BLANK keyword is not present. However, this remains commented out, as I don't think it is necessary at this point, and there is a question about whether it is correct.
  • Other minor typo fixes.
File size: 2.6 KB
RevLine 
[107]1CFLAGS = -c
2
3FFLAGS = -C -fast -O4
4
5CC =    @CC@
6CXX =   @CXX@
[110]7F77=    @F77@ $(FFLAGS)
[107]8
[108]9BASE = ./src
[107]10
11INSTALLDIR = .
12
13EXEC = Duchamp
14
15PGPLOTINC = @PGPLOTINC@
16PGPLOTLIB = @PGPLOTLIB@
17
18CFITSIOINC = @CFITSIOINC@
19CFITSIOLIB = @CFITSIOLIB@
20
21WCSINC = @WCSINC@
22WCSLIB = @WCSLIB@
23
24CINC = $(PGPLOTINC) $(WCSINC) $(CFITSIOINC) -I$(BASE)
25
[110]26LIBS = @LDFLAGS@ $(WCSLIB) $(CFITSIOLIB) $(PGPLOTLIB) @LIBS@
[107]27
28ATROUSDIR = $(BASE)/ATrous
29DETECTIONDIR = $(BASE)/Detection
30CUBESDIR = $(BASE)/Cubes
[165]31FITSIODIR = $(BASE)/FitsIO
[107]32UTILDIR = $(BASE)/Utils
[148]33TESTDIR = ./verification
[107]34
35HEADS = $(BASE)/duchamp.hh\
36        $(BASE)/param.hh\
37        $(ATROUSDIR)/atrous.hh\
38        $(DETECTIONDIR)/detection.hh\
39        $(DETECTIONDIR)/columns.hh\
40        $(CUBESDIR)/cubes.hh\
41        $(CUBESDIR)/plots.hh\
[201]42        $(UTILDIR)/Statistics.hh\
[107]43        $(UTILDIR)/utils.hh
44
[108]45OBJECTS = $(BASE)/mainDuchamp.o \
[123]46        $(BASE)/duchamp.o\
[108]47        $(BASE)/param.o\
[107]48        $(ATROUSDIR)/atrous.o\
49        $(ATROUSDIR)/atrous_1d_reconstruct.o\
50        $(ATROUSDIR)/atrous_2d_reconstruct.o\
51        $(ATROUSDIR)/atrous_3d_reconstruct.o\
52        $(ATROUSDIR)/baselineSubtract.o\
53        $(ATROUSDIR)/ReconSearch.o\
54        $(DETECTIONDIR)/detection.o\
55        $(DETECTIONDIR)/columns.o\
56        $(DETECTIONDIR)/areClose.o\
57        $(DETECTIONDIR)/growObject.o\
58        $(DETECTIONDIR)/lutz_detect.o\
59        $(DETECTIONDIR)/mergeIntoList.o\
60        $(DETECTIONDIR)/outputDetection.o\
61        $(DETECTIONDIR)/sorting.o\
62        $(DETECTIONDIR)/spectrumDetect.o\
63        $(CUBESDIR)/cubes.o\
[224]64        $(CUBESDIR)/cubes_extended.o\
[220]65        $(CUBESDIR)/plots.o\
[107]66        $(CUBESDIR)/baseline.o\
[177]67        $(CUBESDIR)/CubicSearch.o\
[107]68        $(CUBESDIR)/detectionIO.o\
69        $(CUBESDIR)/drawMomentCutout.o\
[222]70        $(CUBESDIR)/drawBlankEdges.o\
[107]71        $(CUBESDIR)/getImage.o\
72        $(CUBESDIR)/invertCube.o\
73        $(CUBESDIR)/Merger.o\
74        $(CUBESDIR)/outputSpectra.o\
75        $(CUBESDIR)/plotting.o\
76        $(CUBESDIR)/readRecon.o\
[208]77        $(CUBESDIR)/readSmooth.o\
[107]78        $(CUBESDIR)/saveImage.o\
[201]79        $(CUBESDIR)/smoothCube.o\
[107]80        $(CUBESDIR)/trimImage.o\
[165]81        $(FITSIODIR)/dataIO.o\
82        $(FITSIODIR)/headerIO.o\
83        $(FITSIODIR)/subsection.o\
84        $(FITSIODIR)/wcsIO.o\
[201]85        $(UTILDIR)/Statistics.o\
[220]86        $(UTILDIR)/feedback.o\
[221]87        $(UTILDIR)/Hanning.o\
[107]88        $(UTILDIR)/getStats.o\
[150]89        $(UTILDIR)/get_random_spectrum.o\
[107]90        $(UTILDIR)/linear_regression.o\
[129]91        $(UTILDIR)/pgplot_related.o\
[107]92        $(UTILDIR)/position_related.o\
93        $(UTILDIR)/sort.o\
94        $(UTILDIR)/wcsFunctions.o\
95        $(UTILDIR)/zscale.o
96
[108]97duchamp : $(OBJECTS)
98        $(CXX) -o $(INSTALLDIR)/$(EXEC) $(OBJECTS) $(LIBS)
[107]99
[149]100createTestImage : $(TESTDIR)/createTestImage.o $(UTILDIR)/get_random_spectrum.o
[148]101        $(CXX) -o createTestImage.x\
[149]102        $(TESTDIR)/createTestImage.o $(UTILDIR)/get_random_spectrum.o\
[148]103        $(CFITSIOLIB) @LIBS@
104
[107]105$(OBJECTS) : $(HEADS)
106
107.cc.o:
108        $(CXX) -c $< $(CINC) -o $@
109
110.c.o:
111        $(CC) -c $< $(CINC) -o $@
112
113clean :
[167]114        rm -f $(BASE)/*.o $(ATROUSDIR)/*.o $(CUBESDIR)/*.o $(FITSIODIR)/*.o $(DETECTIONDIR)/*.o $(UTILDIR)/*.o
Note: See TracBrowser for help on using the repository browser.