From e9b7faa7d8a84a6a7f0e1b65c8859b7405568890 Mon Sep 17 00:00:00 2001 From: Rekhesh Mohan Date: Mon, 2 Jul 2012 22:55:20 +0530 Subject: [PATCH] A few changes in build scripts to handle doc paths --- Makefile.am | 4 +++- configure.ac | 11 +++-------- src/Makefile.am | 5 ----- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5bdb93a..4858d7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,4 +3,6 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = src -dist_doc_DATA = README.txt AUTHORS.txt COPYING.txt ChangeLog.txt INSTALL.txt + +cadsdocdir = $(datadir)/cads/@PACKAGE@ +dist_cadsdoc_DATA = README.txt AUTHORS.txt COPYING.txt ChangeLog.txt INSTALL.txt diff --git a/configure.ac b/configure.ac index 1c311e0..c63208d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,30 +1,25 @@ -AC_PREREQ([2.68]) AC_INIT([CADS_fits2jpeg], [1.0], [cads@iiap.res.in]) +AC_LANG_C +AM_INIT_AUTOMAKE([-Wall -Werror]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE(CADS_fits2jpeg, 1.0) # Checks for programs. -AC_PROG_CXX AC_PROG_CC -AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_PROG_RANLIB # Checks for libraries. # Checks for header files. -AC_CHECK_HEADERS([stdlib.h string.h]) +AC_CHECK_HEADERS([stdio.h stdlib.h string.h math.h]) # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. AC_FUNC_MALLOC -LIBS="$LIBS -lm -Wall -pedantic" - LIBS="$LIBS -L/usr/lib64 -L/usr/lib -lm -ljpeg -lcfitsio" CFLAGS="-ansi $CFLAGS -I/usr/include -I/usr/include/cfitsio" #---------------------------------------------------------------------# diff --git a/src/Makefile.am b/src/Makefile.am index 7f687dc..4b35902 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,3 @@ bin_PROGRAMS = fits2jpeg fits2jpeg_SOURCES = fits2jpeg.c getopt.c signal_handler.c -# set the include path found by configure -INCLUDES= $(all_includes) - -# the library search path. -fits2jpeg_LDFLAGS = $(all_libraries) -- 2.12.1