Attachment #115816 for bug #173900




check_PROGRAMS = \
  cs_ci_demo1 \
  cs_ci_demo2 \
  cs_ci_demo3 \
  cs_cl_demo1 \
  cs_cl_demo2 \
  cs_cl_demo3 \
  cs_demo1 \
  cs_demo2 \
  cs_demo3 \
  cs_di_demo1 \
  cs_di_demo2 \
  cs_di_demo3 \
  cs_dl_demo1 \
  cs_dl_demo2 \
  cs_dl_demo3 \
  cs_idemo \
  cs_ldemo

AM_LDFLAGS = -lm
AM_CFLAGS = -I ../Source

cs_ci_demo1_SOURCES = cs_ci_demo1.c
cs_ci_demo2_SOURCES = cs_ci_demo2.c cs_ci_demo.c
cs_ci_demo3_SOURCES = cs_ci_demo3.c cs_ci_demo.c
cs_cl_demo1_SOURCES = cs_cl_demo1.c
cs_cl_demo2_SOURCES = cs_cl_demo2.c cs_cl_demo.c
cs_cl_demo3_SOURCES = cs_cl_demo3.c cs_cl_demo.c
cs_demo1_SOURCES = cs_demo1.c
cs_demo2_SOURCES = cs_demo2.c cs_demo.c
cs_demo3_SOURCES = cs_demo3.c cs_demo.c
cs_di_demo1_SOURCES = cs_di_demo1.c
cs_di_demo2_SOURCES = cs_di_demo2.c cs_di_demo.c
cs_di_demo3_SOURCES = cs_di_demo3.c cs_di_demo.c
cs_dl_demo1_SOURCES = cs_dl_demo1.c
cs_dl_demo2_SOURCES = cs_dl_demo2.c cs_dl_demo.c
cs_dl_demo3_SOURCES = cs_dl_demo3.c cs_dl_demo.c
cs_idemo_SOURCES = cs_idemo.c
cs_ldemo_SOURCES = cs_ldemo.c

cs_ci_demo1_LDADD = ../Source/libcxsparse.la
cs_ci_demo2_LDADD = ../Source/libcxsparse.la
cs_ci_demo3_LDADD = ../Source/libcxsparse.la
cs_cl_demo1_LDADD = ../Source/libcxsparse.la
cs_cl_demo2_LDADD = ../Source/libcxsparse.la
cs_cl_demo3_LDADD = ../Source/libcxsparse.la
cs_demo1_LDADD = ../Source/libcxsparse.la
cs_demo2_LDADD = ../Source/libcxsparse.la
cs_demo3_LDADD = ../Source/libcxsparse.la
cs_di_demo1_LDADD = ../Source/libcxsparse.la
cs_di_demo2_LDADD = ../Source/libcxsparse.la
cs_di_demo3_LDADD = ../Source/libcxsparse.la
cs_dl_demo1_LDADD = ../Source/libcxsparse.la
cs_dl_demo2_LDADD = ../Source/libcxsparse.la
cs_dl_demo3_LDADD = ../Source/libcxsparse.la
cs_idemo_LDADD = ../Source/libcxsparse.la
cs_ldemo_LDADD = ../Source/libcxsparse.la


Line 0 Link Here

(-)CXSparse.orig/Makefile.am (+4 lines)
	1	SUBDIRS = Demo Source
	2	EXTRA_DIST = README.txt
	3	include_HEADERS = Source/cs.h
	4




CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \
        cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \
        cs_etree.c cs_fkeep.c cs_gaxpy.c cs_happly.c cs_house.c cs_ipvec.c \
        cs_lsolve.c cs_ltsolve.c cs_lu.c cs_lusol.c cs_util.c cs_multiply.c \
        cs_permute.c cs_pinv.c cs_post.c cs_pvec.c cs_qr.c cs_qrsol.c \
        cs_scatter.c cs_schol.c cs_sqr.c cs_symperm.c cs_tdfs.c cs_malloc.c \
        cs_transpose.c cs_compress.c cs_usolve.c cs_utsolve.c cs_scc.c \
        cs_maxtrans.c cs_dmperm.c cs_updown.c cs_print.c cs_norm.c cs_load.c \
        cs_dfs.c cs_reach.c cs_spsolve.c cs_leaf.c cs_ereach.c cs_randperm.c

lib_LTLIBRARIES = libcxsparse.la
noinst_LTLIBRARIES = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la

libcxsparse_la_SOURCES = cs_convert.c
libcxsparse_la_LIBADD = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la

libcxsparse_di_la_SOURCES = $(CS_SOURCE)
libcxsparse_dl_la_SOURCES = $(CS_SOURCE)
libcxsparse_dl_la_CFLAGS = -DCS_LONG
libcxsparse_ci_la_SOURCES = $(CS_SOURCE)
libcxsparse_ci_la_CFLAGS = -DCS_COMPLEX
libcxsparse_cl_la_SOURCES = $(CS_SOURCE)
libcxsparse_cl_la_CFLAGS = -DCS_LONG -DCS_COMPLEX

Line 0 Link Here

(-)CXSparse.orig/configure.ac (+10 lines)
	1	# -- Autoconf --
	2	AC_PREREQ(2.59)
	3	AC_INIT(cxsparse, 2.0.7, davis@cise.ufl.edu)
	4	AM_INIT_AUTOMAKE([foreign])
	5	AC_PROG_INSTALL
	6	AC_PROG_LIBTOOL
	7	AC_CHECK_LIB(m, sqrt)
	8	AC_CONFIG_FILES([Makefile Demo/Makefile Source/Makefile])
	9	AC_OUTPUT
	10

Return to bug 173900

Line 0 Link Here

(-)CXSparse.orig/Demo/Makefile.am (+58 lines)
	1	check_PROGRAMS = \
	2	cs_ci_demo1 \
	3	cs_ci_demo2 \
	4	cs_ci_demo3 \
	5	cs_cl_demo1 \
	6	cs_cl_demo2 \
	7	cs_cl_demo3 \
	8	cs_demo1 \
	9	cs_demo2 \
	10	cs_demo3 \
	11	cs_di_demo1 \
	12	cs_di_demo2 \
	13	cs_di_demo3 \
	14	cs_dl_demo1 \
	15	cs_dl_demo2 \
	16	cs_dl_demo3 \
	17	cs_idemo \
	18	cs_ldemo
	19
	20	AM_LDFLAGS = -lm
	21	AM_CFLAGS = -I ../Source
	22
	23	cs_ci_demo1_SOURCES = cs_ci_demo1.c
	24	cs_ci_demo2_SOURCES = cs_ci_demo2.c cs_ci_demo.c
	25	cs_ci_demo3_SOURCES = cs_ci_demo3.c cs_ci_demo.c
	26	cs_cl_demo1_SOURCES = cs_cl_demo1.c
	27	cs_cl_demo2_SOURCES = cs_cl_demo2.c cs_cl_demo.c
	28	cs_cl_demo3_SOURCES = cs_cl_demo3.c cs_cl_demo.c
	29	cs_demo1_SOURCES = cs_demo1.c
	30	cs_demo2_SOURCES = cs_demo2.c cs_demo.c
	31	cs_demo3_SOURCES = cs_demo3.c cs_demo.c
	32	cs_di_demo1_SOURCES = cs_di_demo1.c
	33	cs_di_demo2_SOURCES = cs_di_demo2.c cs_di_demo.c
	34	cs_di_demo3_SOURCES = cs_di_demo3.c cs_di_demo.c
	35	cs_dl_demo1_SOURCES = cs_dl_demo1.c
	36	cs_dl_demo2_SOURCES = cs_dl_demo2.c cs_dl_demo.c
	37	cs_dl_demo3_SOURCES = cs_dl_demo3.c cs_dl_demo.c
	38	cs_idemo_SOURCES = cs_idemo.c
	39	cs_ldemo_SOURCES = cs_ldemo.c
	40
	41	cs_ci_demo1_LDADD = ../Source/libcxsparse.la
	42	cs_ci_demo2_LDADD = ../Source/libcxsparse.la
	43	cs_ci_demo3_LDADD = ../Source/libcxsparse.la
	44	cs_cl_demo1_LDADD = ../Source/libcxsparse.la
	45	cs_cl_demo2_LDADD = ../Source/libcxsparse.la
	46	cs_cl_demo3_LDADD = ../Source/libcxsparse.la
	47	cs_demo1_LDADD = ../Source/libcxsparse.la
	48	cs_demo2_LDADD = ../Source/libcxsparse.la
	49	cs_demo3_LDADD = ../Source/libcxsparse.la
	50	cs_di_demo1_LDADD = ../Source/libcxsparse.la
	51	cs_di_demo2_LDADD = ../Source/libcxsparse.la
	52	cs_di_demo3_LDADD = ../Source/libcxsparse.la
	53	cs_dl_demo1_LDADD = ../Source/libcxsparse.la
	54	cs_dl_demo2_LDADD = ../Source/libcxsparse.la
	55	cs_dl_demo3_LDADD = ../Source/libcxsparse.la
	56	cs_idemo_LDADD = ../Source/libcxsparse.la
	57	cs_ldemo_LDADD = ../Source/libcxsparse.la
	58

Line 0 Link Here

(-)CXSparse.orig/Source/Makefile.am (+23 lines)
	1	CS_SOURCE = cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \
	2	cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \
	3	cs_etree.c cs_fkeep.c cs_gaxpy.c cs_happly.c cs_house.c cs_ipvec.c \
	4	cs_lsolve.c cs_ltsolve.c cs_lu.c cs_lusol.c cs_util.c cs_multiply.c \
	5	cs_permute.c cs_pinv.c cs_post.c cs_pvec.c cs_qr.c cs_qrsol.c \
	6	cs_scatter.c cs_schol.c cs_sqr.c cs_symperm.c cs_tdfs.c cs_malloc.c \
	7	cs_transpose.c cs_compress.c cs_usolve.c cs_utsolve.c cs_scc.c \
	8	cs_maxtrans.c cs_dmperm.c cs_updown.c cs_print.c cs_norm.c cs_load.c \
	9	cs_dfs.c cs_reach.c cs_spsolve.c cs_leaf.c cs_ereach.c cs_randperm.c
	10
	11	lib_LTLIBRARIES = libcxsparse.la
	12	noinst_LTLIBRARIES = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la
	13
	14	libcxsparse_la_SOURCES = cs_convert.c
	15	libcxsparse_la_LIBADD = libcxsparse_di.la libcxsparse_dl.la libcxsparse_ci.la libcxsparse_cl.la
	16
	17	libcxsparse_di_la_SOURCES = $(CS_SOURCE)
	18	libcxsparse_dl_la_SOURCES = $(CS_SOURCE)
	19	libcxsparse_dl_la_CFLAGS = -DCS_LONG
	20	libcxsparse_ci_la_SOURCES = $(CS_SOURCE)
	21	libcxsparse_ci_la_CFLAGS = -DCS_COMPLEX
	22	libcxsparse_cl_la_SOURCES = $(CS_SOURCE)
	23	libcxsparse_cl_la_CFLAGS = -DCS_LONG -DCS_COMPLEX