Skip to content

Commit

Permalink
make "make dist" work better
Browse files Browse the repository at this point in the history 
I think I'm still missing a few files, but this is mostly there.
  • Loading branch information
@novas0x2a
novas0x2a committed Apr 17, 2009
1 parent 1b02cc4 commit c7fbdda
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 29 deletions.
13 changes: 12 additions & 1 deletion Makefile.am
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ ACLOCAL_AMFLAGS = -I m4 -I thirdparty/m4


SUBDIRS = src SUBDIRS = src


EXTRA_DIST = config/rules.mak config/relicense thirdparty/MBA_1.0_gpl thirdparty/cxxtest EXTRA_DIST = \
INSTALLGUIDE \
config/rules.mak \
config/relicense \
thirdparty/MBA-1.1 \
thirdparty/cxxtest \
data \
docs \
stereo.default.example


######################################################################## ########################################################################
# special top-level rules # special top-level rules
Expand All @@ -38,6 +46,9 @@ EXTRA_DIST = config/rules.mak config/relicense thirdparty/MBA_1.0_gpl thirdparty


dist-hook: dist-hook:
rm -rf `find $(distdir) -name '.svn'` rm -rf `find $(distdir) -name '.svn'`
rm -f $(distdir)/thirdparty/MBA-1.1/lib/* \
$(distdir)/thirdparty/MBA-1.1/app/mainSimplest \
$(distdir)/thirdparty/MBA-1.1/app/mainSimplest.o
if DIST_LICENSE if DIST_LICENSE
cp $(DIST_LICENSE) $(distdir)/COPYING cp $(DIST_LICENSE) $(distdir)/COPYING
endif endif
Expand Down
138 changes: 110 additions & 28 deletions src/Makefile.am
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,29 +23,87 @@
# sources # sources
######################################################################## ########################################################################
SUBDIRS = tests SUBDIRS = tests
EXTRA_DIST=


bin_PROGRAMS= bin_PROGRAMS=


rmax_code = RMAX/StereoSessionRmax.cc RMAX/RMAX.cc rmax_code = \
bundle_code = BundleAdjustUtils.cc ControlNetworkLoader.cc RMAX/RMAX.cc \
RMAX/RMAX.h \
RMAX/StereoSessionRmax.cc \
RMAX/StereoSessionRmax.h


stereo_code = MOLAReader.cc \ bundle_code = \
StereoSession.cc StereoSessionKeypoint.cc StereoSessionPinhole.cc \ BundleAdjustUtils.cc \
TabulatedDataReader.cc KML.cc StereoSettings.cc \ BundleAdjustUtils.h \
$(rmax_code) $(bundle_code) ControlNetworkLoader.cc \
ControlNetworkLoader.h


ctx_code = MRO/DiskImageResourceDDD.cc stereo_code = \
KML.cc \
KML.h \
MedianFilter.h \
MOLAReader.cc \
MOLAReader.h \
stereo.h \
StereoSession.cc \
StereoSession.h \
StereoSessionKeypoint.cc \
StereoSessionKeypoint.h \
StereoSessionPinhole.cc \
StereoSessionPinhole.h \
StereoSettings.cc \
StereoSettings.h \
SurfaceNURBS.h \
TabulatedDataReader.cc \
TabulatedDataReader.h \
$(rmax_code) \
$(bundle_code)

ctx_code = \
MRO/DiskImageResourceDDD.cc \
MRO/DiskImageResourceDDD.h


if HAVE_PKG_ISIS if HAVE_PKG_ISIS
isis_code = Isis/IsisCameraModel.cc Isis/DiskImageResourceIsis.cc Isis/IsisAdjustCameraModel.cc isis_code = \
stereo_code += $(isis_code) Isis/StereoSessionIsis.cc Isis/DiskImageResourceIsis.cc \
Isis/DiskImageResourceIsis.h \
Isis/Equations.h \
Isis/IsisAdjustCameraModel.cc \
Isis/IsisAdjustCameraModel.h \
Isis/IsisCameraModel.cc \
Isis/IsisCameraModel.h

stereo_code += $(isis_code) Isis/StereoSessionIsis.cc Isis/StereoSessionIsis.h
endif endif


if HAVE_PKG_SPICE if HAVE_PKG_SPICE
spice_code = SpiceUtilities.cc spice_code = SpiceUtilities.cc SpiceUtilities.h
ctx_code += MRO/StereoSessionCTX.cc MRO/CTXEphemeris.cc MRO/CTXMetadata.cc
moc_code = MOC/StereoSessionMOC.cc MOC/Ephemeris.cc MOC/Metadata.cc MOC/MOLA.cc ctx_code += \
hrsc_code = HRSC/StereoSessionHRSC.cc HRSC/HRSC.cc MRO/CTXEphemeris.cc \
MRO/CTXEphemeris.h \
MRO/CTXMetadata.cc \
MRO/CTXMetadata.h \
MRO/StereoSessionCTX.cc \
MRO/StereoSessionCTX.h

moc_code = \
MOC/Ephemeris.cc \
MOC/Ephemeris.h \
MOC/Metadata.cc \
MOC/Metadata.h \
MOC/MOLA.cc \
MOC/MOLA.h \
MOC/StereoSessionMOC.cc \
MOC/StereoSessionMOC.h

hrsc_code = \
HRSC/ExtoriExtrinsics.h \
HRSC/HRSC.cc \
HRSC/HRSC.h \
HRSC/StereoSessionHRSC.cc \
HRSC/StereoSessionHRSC.h
endif endif


stereo_code += $(spice_code) $(ctx_code) $(moc_code) $(hrsc_code) stereo_code += $(spice_code) $(ctx_code) $(moc_code) $(hrsc_code)
Expand All @@ -56,21 +114,45 @@ if MAKE_APP_STEREO
stereo_LDADD = $(APP_STEREO_LIBS) stereo_LDADD = $(APP_STEREO_LIBS)
endif endif


EXTRA_DIST+=gui/PreviewGLWidget.frag

if MAKE_APP_STEREOGUI if MAKE_APP_STEREOGUI
bin_PROGRAMS += stereo_gui bin_PROGRAMS += stereo_gui
stereo_gui_SOURCES = stereo_gui.cc \
gui/MainWindow.cc gui/MainWindow.moc.cc \ stereo_gui_SOURCES = \
gui/MainWindow.h gui/InputWidget.cc \ gui/AlignmentWidget.cc \
gui/InputWidget.moc.cc gui/InputWidget.h \ gui/AlignmentWidget.h \
gui/AlignmentWidget.cc gui/AlignmentWidget.moc.cc \ gui/CorrelationWidget.cc \
gui/AlignmentWidget.h gui/PreviewGLWidget.cc \ gui/CorrelationWidget.h \
gui/PreviewGLWidget.moc.cc gui/PreviewGLWidget.h \ gui/CostFunctionWidget.cc \
gui/StereoGuiSession.cc gui/StereoGuiSession.moc.cc \ gui/CostFunctionWidget.h \
gui/StereoGuiSession.h gui/ProgressBar.moc.cc \ gui/InputWidget.cc \
gui/ProgressBar.h gui/ProgressBar.cc $(stereo_code) gui/InputWidget.h \
gui/KyleStereo.h \
gui/MainWindow.cc \
gui/MainWindow.h \
gui/Noise.h \
gui/PreprocessWidget.cc \
gui/PreprocessWidget.h \
gui/PreviewGLWidget.cc \
gui/PreviewGLWidget.h \
gui/QCompatFormLayout.h \
gui/SearchWindowWidget.cc \
gui/SearchWindowWidget.h \
gui/StereoGuiSession.cc \
gui/StereoGuiSession.h \
$(stereo_code) \
stereo_gui.cc

nodist_stereo_gui_SOURCES = \
gui/AlignmentWidget.moc.cc \
gui/InputWidget.moc.cc \
gui/MainWindow.moc.cc \
gui/PreviewGLWidget.moc.cc \
gui/StereoGuiSession.moc.cc

stereo_gui_LDADD = $(APP_STEREOGUI_LIBS) stereo_gui_LDADD = $(APP_STEREOGUI_LIBS)


BUILT_SOURCES = gui/MainWindow.moc.cc
endif endif


if MAKE_APP_BUNDLEADJUST if MAKE_APP_BUNDLEADJUST
Expand All @@ -93,13 +175,13 @@ endif


if MAKE_APP_POINT2MESH if MAKE_APP_POINT2MESH
bin_PROGRAMS += point2mesh bin_PROGRAMS += point2mesh
point2mesh_SOURCES = point2mesh.cc nff_terrain.cc point2mesh_SOURCES = point2mesh.cc nff_terrain.cc nff_terrain.h
point2mesh_LDADD = $(APP_POINT2MESH_LIBS) point2mesh_LDADD = $(APP_POINT2MESH_LIBS)
endif endif


if MAKE_APP_POINT2DEM if MAKE_APP_POINT2DEM
bin_PROGRAMS += point2dem bin_PROGRAMS += point2dem
point2dem_SOURCES = point2dem.cc DEM.cc SoftwareRenderer.cc point2dem_SOURCES = point2dem.cc DEM.cc DEM.h SoftwareRenderer.cc SoftwareRenderer.h OrthoRasterizer.h
point2dem_LDADD = $(APP_POINT2DEM_LIBS) point2dem_LDADD = $(APP_POINT2DEM_LIBS)
endif endif


Expand All @@ -112,7 +194,7 @@ endif


if MAKE_APP_CTXIMAGE if MAKE_APP_CTXIMAGE
bin_PROGRAMS += ctximage bin_PROGRAMS += ctximage
ctximage_SOURCES = ctximage.cc MRO/DiskImageResourceDDD.cc ctximage_SOURCES = ctximage.cc MRO/DiskImageResourceDDD.cc MRO/DiskImageResourceDDD.h
ctximage_LDADD = $(APP_CTXIMAGE_LIBS) ctximage_LDADD = $(APP_CTXIMAGE_LIBS)
endif endif


Expand All @@ -136,7 +218,7 @@ endif


if MAKE_APP_BUNDLEVIS if MAKE_APP_BUNDLEVIS
bin_PROGRAMS += bundlevis bin_PROGRAMS += bundlevis
bundlevis_SOURCES = bundlevis.cc bundlevis_SOURCES = bundlevis.cc bundlevis.h
bundlevis_LDADD = $(APP_BUNDLEVIS_LIBS) bundlevis_LDADD = $(APP_BUNDLEVIS_LIBS)
endif endif


Expand Down

0 comments on commit c7fbdda

Please sign in to comment.