X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=Makefile.am;h=713cffb0b81e027fd17d43a885e69b70d766012a;hb=9c27b1e33c3c5de8dd33bf7d130389e55bdc9caa;hp=6809a32f63a41e1ced9c29c3356fd690a4e8315d;hpb=83da32283331b779cb2a50b3af95835046c89843;p=scdataviz

diff --git a/Makefile.am b/Makefile.am
index 6809a32..713cffb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,9 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = gnu subdir-objects
-AM_DEFAULT_SOURCE_EXT = .c++
 ACLOCAL_AMFLAGS=-I m4
-AM_YFLAGS=-d
-AM_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) 
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) 
+AM_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(GTK_CFLAGS)
 
-bin_PROGRAMS = kdotp/kdotp kdotp/makestruct
-lib_LTLIBRARIES = libkdotp/libkdotp-0.1.la libmodelxx/libmodelxx-0.1.la
-
-#Tests which should succeed
-TESTS=tests/tests
-
-check_PROGRAMS = tests/tests
-tests_tests_SOURCES = 
-LIBS +=  -lm
-#Tests which should fail.
-XFAIL_TESTS=
+bin_PROGRAMS = src/scdataviz
 
 CLEANFILES = program_version.c
 
@@ -25,14 +12,5 @@ program_version.c:
 	bzr version-info | perl -ne 'chomp; print; print "\\n";' >> program_version.c 
 	echo '";' >> program_version.c
 
-include_HEADERS=
-include libkdotp.am
-include libmodelxx.am
-
-kdotp_kdotp_SOURCES = kdotp/kdotp.c++
-kdotp_kdotp_LDADD = libkdotp/libkdotp-0.1.la
-LIBS += $(GLIB_LIBS) $(GIO_LIBS)
-
-kdotp_makestruct_SOURCES = kdotp/makestruct.c++ kdotp/structspec_parser.y++ kdotp/structspec_lexer.l++
-kdotp_makestruct_LDADD = libkdotp/libkdotp-0.1.la libmodelxx/libmodelxx-0.1.la
-LIBS += $(GLIB_LIBS) $(GIO_LIBS)
+src_scdataviz_SOURCES = src/graph.c src/matdb.c src/scdataviz.c src/graphwidget.c src/matdb-dotcode.c program_version.c
+LIBS += $(GLIB_LIBS) $(GIO_LIBS) $(GTK_LIBS)