Merge branch 'next' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / utils / Modeller / Makefile.am

diff --git a/utils/Modeller/Makefile.am b/utils/Modeller/Makefile.am
index 82223ad08abf29493c24f756a6c8c8389b20e1cd..877fe39e9f69097dca2cb9f75cff4479dfe68910 100644 (file)
--- a/utils/Modeller/Makefile.am
+++ b/utils/Modeller/Makefile.am
@@ -1,7 +1,15 @@
-noinst_PROGRAMS = threedconvert animassist
+noinst_PROGRAMS = animassist normalmap photomodel
 
-threedconvert_SOURCES = 3dconvert.cxx
-threedconvert_LDADD = -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(audio_LIBS)
+# threedconvert_SOURCES = 3dconvert.cxx
+# threedconvert_LDADD = -lplibssg -lplibsg -lplibul \
+#                      $(opengl_LIBS) $(joystick_LIBS)
 
 animassist_SOURCES = animassist.c
 animassist_LDADD = $(base_LIBS)
+
+normalmap_SOURCES = normalmap.cxx texture.cxx texture.hxx colours.h
+normalmap_LDADD = -lsgscreen $(opengl_LIBS) $(base_LIBS) -lz
+
+photomodel_SOURCES = photomodel.cxx
+photomodel_LDADD = $(base_LIBS) -lsgbucket -lsgmath -lsgmisc -lsgdebug \
+                   -lsgstructure