repository reorganizing

[chaz/yoink] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9a7f5146e454789933ca73128d720488f1e5429d..98cf9b91e804e3ae52377c093b9a13719352fa8c 100644 (file)
--- 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 \
@@ -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