]>
Commit | Line | Data |
---|---|---|
b47f39ab JB |
1 | --- hugin-0.6/src/nona_gui/Makefile.am.orig 2006-07-23 11:50:10.000000000 +0200 |
2 | +++ hugin-0.6/src/nona_gui/Makefile.am 2006-08-19 22:22:16.302037250 +0200 | |
3 | @@ -2,7 +2,6 @@ | |
4 | DEFAULT_INCLUDES="-I." | |
5 | INCLUDES = -I$(top_builddir)/src/include -I${top_srcdir}/src/include -I${top_srcdir}/src/foreign $(WX_CXXFLAGS) | |
6 | AM_CXXFLAGS = $(JPEG_FLAGS) $(PNG_FLAGS) $(TIFF_FLAGS) $(ZLIB_FLAGS) $(PANO_FLAGS) $(BOOST_CPPFLAGS) -DINSTALL_XRC_DIR=\"$(datadir)/hugin/xrc\" -DINSTALL_LOCALE_DIR=\"${datadir}/locale\" | |
7 | -AM_LDFLAGS = $(WX_LIBS) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) $(LIB_PANO) $(BOOST_THREAD_LIB) | |
8 | ||
9 | SUFFIXES = .rc | |
10 | ||
11 | @@ -29,7 +28,8 @@ | |
12 | ${top_builddir}/src/jhead/libjhead.la \ | |
13 | ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \ | |
14 | ${top_builddir}/src/hugin/libhuginwxutils.la \ | |
15 | - ${top_builddir}/src/vigra_ext/libvigra_ext.la | |
16 | + ${top_builddir}/src/vigra_ext/libvigra_ext.la \ | |
17 | + $(WX_LIBS) $(LIB_JPEG) $(LIB_PNG) $(LIB_TIFF) $(LIB_ZLIB) $(LIB_PANO) $(BOOST_THREAD_LIB) | |
18 | ||
19 | EXTRA_DIST = nona_gui_rc.rc nona_gui.vcproj | |
20 | ||
af62f746 SS |
21 | --- hugin-0.7_beta4/src/Panorama/Makefile.am.orig 2007-03-11 21:41:11.000000000 +0000 |
22 | +++ hugin-0.7_beta4/src/Panorama/Makefile.am 2007-03-11 21:43:21.000000000 +0000 | |
23 | @@ -6,6 +6,7 @@ | |
24 | ||
25 | noinst_LTLIBRARIES = libpanorama.la | |
26 | libpanorama_la_SOURCES = Panorama.cpp PanoramaMemento.cpp PanoImage.cpp PanoToolsInterface.cpp SpaceTransform.cpp PTOptimise.cpp ImageGraph.cpp Stitcher.cpp Stitcher1.cpp Stitcher2.cpp Stitcher3.cpp Stitcher4.cpp utils.cpp | |
27 | +libpanorama_la_LIBADD = $(BOOST_THREAD_LIB) | |
28 | ||
29 | EXTRA_DIST=Panorama.vcproj OptimizeOptions.cpp | |
30 | noinst_HEADERS = |