From 9c27b1e33c3c5de8dd33bf7d130389e55bdc9caa Mon Sep 17 00:00:00 2001 From: "trelane@digitasaru.net" Date: Thu, 15 Oct 2009 21:32:43 -0500 Subject: [PATCH] * HEAD: Removed redundant directory * AUTHORS NEWS README Created these files; they are empty. * .bzrignore Added in bzrignore data from gimme-alpha * Makefile.am cofnigure.ac Converted to work for scdataviz --- .bzrignore | 35 ++++++++++++++++++ Makefile.am | 30 ++------------- configure.ac | 115 ++++++++-------------------------------------------------- 3 files changed, 54 insertions(+), 126 deletions(-) create mode 100644 AUTHORS create mode 100644 NEWS create mode 100644 README diff --git a/.bzrignore b/.bzrignore index d464470..1ef5331 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,2 +1,37 @@ scdataviz HEAD +m4 +.deps +Makefile.in +aclocal.m4 +autom4te.cache +config.h +config.h.in +config.log +config.status +configure +depcomp +gimme-alpha +gimme-density +install-sh +missing +outfile +stamp-h1 +Makefile +.dirstamp +tests/tests +CUnit*.xml +program_version.c +config.guess +config.sub +ltmain.sh +m4/ +libtool +.so.* +*.so +*.lo +*.loi +*.la +*.lai +.libs +compile diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 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) diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100644 index 0000000..e69de29 diff --git a/configure.ac b/configure.ac index 178e8d4..dd62150 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,11 @@ AC_PREREQ(2.61) -AC_INIT([gimme-alpha], [0.1], [gimme-alpha@pingenot.org]) -AM_INIT_AUTOMAKE([gnu -Wno-portability]) +AC_INIT([scdataviz], [0.1], [scdataviz@digitasaru.net]) +AM_INIT_AUTOMAKE([gnu -Wportability]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC -AC_PROG_CXX -AC_PROG_LIBTOOL -AC_PROG_INSTALL -AM_PROG_LEX -AC_PROG_YACC +AM_PROG_CC_C_O PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6, have_glib=true, have_glib=false) AC_SUBST(GLIB_CFLAGS) @@ -19,18 +15,9 @@ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.18, have_gio=true, have_gio=false) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) -PKG_CHECK_MODULES(FFTW3, fftw3 >= 3.1.2, have_fftw3=true, have_fftw3=false) -AC_SUBST(FFTW3_CFLAGS) -AC_SUBST(FFTW3_LIBS) - -dnl Check for GNU Scientific Lib, link to it if found. -AC_CHECK_LIB([m],[cos]) -AC_CHECK_LIB([gslcblas],[cblas_dgemm]) -AC_CHECK_LIB([gsl],[gsl_blas_dgemm]) - -dnl PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 3.1, have_gtk=true, have_gtk=false) -dnl AC_SUBST(GTK_CFLAGS) -dnl AC_SUBST(GTK_LIBS) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 3.1, have_gtk=true, have_gtk=false) +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) AC_ARG_ENABLE([debug], [ --enable-debug Turn on debugging], @@ -41,88 +28,16 @@ AC_ARG_ENABLE([debug], esac],[debug=false]) AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) -COMMMON_CFLAGS="-pipe -Wall -Werror -std=gnu99 -pedantic -Wno-unused-variable -Wno-unused-label -Wno-unused-parameter -Wno-unused-value -Wno-unused-function -march=native -mfpmath=sse -msse -mmmx -msse2 -msse3 -mssse3 -ftracer -fbranch-target-load-optimize" -if test "x$debug" = "xtrue"; then - CFLAGS="$COMMMON_CFLAGS -O0 -g3" -else - CFLAGS="$COMMMON_CFLAGS -O3 -frename-registers " -fi -dnl CPPFLAGS= - -AC_ARG_ENABLE([mudflap], -[ --enable-mudflap Turn on mudflap, which debugs pointer use (verbosely)], -[case "${enableval}" in - yes) mudflap=true ;; - no) mudflap=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-mudflap]) ;; -esac],[mudflap=false]) -AM_CONDITIONAL([MUDFLAP], [test x$mudflap = xtrue]) -if test "x$mudflap" = "xtrue"; then - CFLAGS="$CFLAGS -fmudflap -lmudflap" -fi - -AC_ARG_ENABLE([profiling], -[ --enable-profiling Turn on profiling], -[case "${enableval}" in - yes) profiling=true ;; - no) profiling=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-profiling]) ;; -esac],[profiling=false]) -AM_CONDITIONAL([PROFILING], [test x$profiling = xtrue]) -if test "x$profiling" = "xtrue"; then - CFLAGS="$CFLAGS -pg -fprofile-generate" -fi - -AC_ARG_ENABLE([openmpi], -[ --enable-openmpi Turn on OpenMPI support], +AC_ARG_ENABLE([maemo], +[ --enable-maemo=device Enable maemo build], [case "${enableval}" in - yes) openmpi=true ;; - no) openmpi=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-openmpi]) ;; -esac],[mkl=false]) -AM_CONDITIONAL([OPENMPI], [test x$openmpi = xtrue]) -if test "x$openmpi" = "xtrue"; then - CFLAGS="$CFLAGS -DOPENMPI" -fi - -AC_ARG_ENABLE([acml], -[ --enable-acml Turn on AMD Core Math Library support], -[case "${enableval}" in - yes) acml=true ;; - no) acml=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-acml]) ;; -esac],[mkl=false]) -AM_CONDITIONAL([ACML], [test x$acml = xtrue]) -if test "x$acml" = "xtrue"; then - CFLAGS="$CFLAGS -DACML" -fi - -AC_ARG_ENABLE([mkl], -[ --enable-mkl Turn on Intel's Math Kernel Library support], -[case "${enableval}" in - yes) mkl=true ;; - no) mkl=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-mkl]) ;; -esac],[mkl=false]) -AM_CONDITIONAL([MKL], [test x$mkl = xtrue]) -if test "x$mkl" = "xtrue"; then - CFLAGS="$CFLAGS -DMKL" -fi - -AC_ARG_ENABLE([atlas], -[ --enable-atlas Turn on ATLAS support], -[case "${enableval}" in - yes) atlas=true ;; - no) atlas=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-atlas]) ;; -esac],[atlas=false]) -AM_CONDITIONAL([ATLAS], [test x$atlas = xtrue]) -if test "x$atlas" = "xtrue"; then - CFLAGS="$CFLAGS -DATLAS" -fi - -LIBKDOTP_ABI_VERSION=0 -LIBMODELXX_ABI_VERSION=0 + n770) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;; + n800) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;; + n810) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;; + n900) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;; + *) CFLAGS="$CFLAGS -mfpu=vfp -mfloat-abi=softfp" ;; +esac],[maemo=false]) +dnl AM_CONDITIONAL([MAEMO], [test x$maemo != xfalse]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- 1.7.9.5