X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMakefile.am;h=98cf9b91e804e3ae52377c093b9a13719352fa8c;hp=c87c4126ffdff48ae4c4b8085882c5e360c93028;hb=cf4c819df08e2ab6c06532d8a4467fa58b2792ae;hpb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c

diff --git a/src/Makefile.am b/src/Makefile.am
index c87c412..98cf9b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,10 @@
 
 noinst_LIBRARIES = libmoof.a
 
+libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
+
 libmoof_a_SOURCES = \
+					Moof/Aabb.cc \
 					Moof/Aabb.hh \
 					Moof/Backend.cc \
 					Moof/Backend.hh \
@@ -29,8 +32,8 @@ libmoof_a_SOURCES = \
 					Moof/Event.hh \
 					Moof/Frustum.cc \
 					Moof/Frustum.hh \
-					Moof/Hash.cc \
-					Moof/Hash.hh \
+					Moof/HashTools.cc \
+					Moof/HashTools.hh \
 					Moof/Image.cc \
 					Moof/Image.hh \
 					Moof/Interpolator.hh \
@@ -70,8 +73,6 @@ libmoof_a_SOURCES = \
 					Moof/fastevents.h \
 					$(ENDLIST)
 
-libmoof_a_CPPFLAGS = -I$(top_srcdir)/src/Moof
-
 EXTRA_DIST = Moof/cml Moof/stlplus
 
 
@@ -81,6 +82,9 @@ EXTRA_DIST = Moof/cml Moof/stlplus
 
 bin_PROGRAMS = yoink
 
+yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
+yoink_LDADD = libmoof.a
+
 yoink_SOURCES = \
 				Animation.cc \
 				Animation.hh \
@@ -110,14 +114,13 @@ yoink_SOURCES = \
 				$(ENDLIST)
 
 if WIN32
-yoink_SOURCES += yoink.rc yoink.ico
-.rc.o:
-	$(AM_V_GEN) $(WINDRES) -o $@ -i $<
-endif
 
-yoink_CPPFLAGS = -I$(top_srcdir)/src/Moof
-yoink_LDADD = libmoof.a
+yoink_SOURCES += yoink.rc
 
+.rc.o:
+	$(WINDRES) -o $@ -i $<
+
+else
 
 YOINK_ENVIRONMENT = YOINK_DATADIR="$(top_srcdir)/data"
 
@@ -125,5 +128,7 @@ run: all
 	$(YOINK_ENVIRONMENT) ./yoink $(YOINK_OPTS)
 
 debug: all
-	$(YOINK_ENVIRONMENT) ddd ./yoink
+	$(YOINK_ENVIRONMENT) gdb ./yoink
+
+endif