Minor changes that do not effect anything.

10 files changed, 23 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index b234b31..eb9bba7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . src scripts doc
 pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@
 ACLOCAL_AMFLAGS = -I m4
 DATADIRS = calfiles parmfiles idl
-EXTRA_DIST = $(DATADIRS) \
+INCLUDE_FILES = \
 			 src/fes/cf_calfes.h \
 			 src/include/calfitsio.h \
 			 src/include/calfuse.h \
@@ -25,15 +25,9 @@ EXTRA_DIST = $(DATADIRS) \
 			 src/include/slalib.h \
 			 src/include/slamac.h
 
-#			 scripts/calfuse.wavecal \
-#			 scripts/cf_make_900_obs.csh \
-#			 scripts/cf_make_all.csh \
-#			 scripts/cf_make_all_obs.csh \
-#			 scripts/idl_obsplot.pl \
-#			 scripts/idlplot_rate.pl \
-#			 scripts/idlplot_spex.pl \
-#			 scripts/listhead \
-#			 scripts/listtra
+noinst_HEADERS = $(INCLUDE_FILES)
+
+EXTRA_DIST = $(DATADIRS)
 
 install-data-local: $(DATADIRS)
 	mkdir -p $(DESTDIR)$(pkgdatadir)
diff --git a/Makefile.in b/Makefile.in
index fddace7..c0ef8fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,6 +13,7 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
@@ -95,7 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(am__DIST_COMMON)
+	$(am__configure_deps) $(noinst_HEADERS) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -129,6 +130,7 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
@@ -331,7 +333,7 @@ top_srcdir = @top_srcdir@
 SUBDIRS = . src scripts doc
 ACLOCAL_AMFLAGS = -I m4
 DATADIRS = calfiles parmfiles idl
-EXTRA_DIST = $(DATADIRS) \
+INCLUDE_FILES = \
 			 src/fes/cf_calfes.h \
 			 src/include/calfitsio.h \
 			 src/include/calfuse.h \
@@ -354,6 +356,8 @@ EXTRA_DIST = $(DATADIRS) \
 			 src/include/slalib.h \
 			 src/include/slamac.h
 
+noinst_HEADERS = $(INCLUDE_FILES)
+EXTRA_DIST = $(DATADIRS)
 all: all-recursive
 
 .SUFFIXES:
@@ -711,7 +715,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile
+all-am: Makefile $(HEADERS)
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -836,16 +840,6 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
-#			 scripts/calfuse.wavecal \
-#			 scripts/cf_make_900_obs.csh \
-#			 scripts/cf_make_all.csh \
-#			 scripts/cf_make_all_obs.csh \
-#			 scripts/idl_obsplot.pl \
-#			 scripts/idlplot_rate.pl \
-#			 scripts/idlplot_spex.pl \
-#			 scripts/listhead \
-#			 scripts/listtra
-
 install-data-local: $(DATADIRS)
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	cp -a $(DATADIRS) $(DESTDIR)$(pkgdatadir)
diff --git a/src/analysis/Makefile.am b/src/analysis/Makefile.am
index 5c9d665..19f6ac8 100644
--- a/src/analysis/Makefile.am
+++ b/src/analysis/Makefile.am
@@ -51,4 +51,4 @@ ttag_lightcurve_mjd2hmjd_SOURCES = ttag_lightcurve_mjd2hmjd.c gethmjd.c
 ttag_lightcurve_periodogram_SOURCES = ttag_lightcurve_periodogram.c
 
 LDADD = ../libcf/libcf.la ../slalib/libsla.la $(cfitsio_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/include -I./ -DCFORTRAN -Df2cFortran
+AM_CFLAGS = -I$(srcdir)/include -I./ -DCFORTRAN -Df2cFortran
diff --git a/src/analysis/Makefile.in b/src/analysis/Makefile.in
index 02ba382..4414951 100644
--- a/src/analysis/Makefile.in
+++ b/src/analysis/Makefile.in
@@ -531,7 +531,7 @@ ttag_lightcurve_combine_SOURCES = ttag_lightcurve_combine.c
 ttag_lightcurve_mjd2hmjd_SOURCES = ttag_lightcurve_mjd2hmjd.c gethmjd.c
 ttag_lightcurve_periodogram_SOURCES = ttag_lightcurve_periodogram.c
 LDADD = ../libcf/libcf.la ../slalib/libsla.la $(cfitsio_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/include -I./ -DCFORTRAN -Df2cFortran
+AM_CFLAGS = -I$(srcdir)/include -I./ -DCFORTRAN -Df2cFortran
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/cal/jitter/Makefile.am b/src/cal/jitter/Makefile.am
index 2eaa6d0..b2e8967 100644
--- a/src/cal/jitter/Makefile.am
+++ b/src/cal/jitter/Makefile.am
@@ -4,4 +4,4 @@ bin_PROGRAMS = cf_jitter_diag \
 cf_jitter_diag_SOURCES = cf_jitter_diag.c
 cf_jitter_SOURCES = cf_jitter.c
 LDADD = ../../libcf/libcf.la ../../slalib/libsla.la $(cfitsio_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/include -I./ -DCFORTRAN -Df2cFortran $(cfitsio_CFLAGS)
+AM_CFLAGS = -I$(srcdir)/include -I./ -DCFORTRAN -Df2cFortran $(cfitsio_CFLAGS)
diff --git a/src/cal/jitter/Makefile.in b/src/cal/jitter/Makefile.in
index 17bfb6f..0a8c5fa 100644
--- a/src/cal/jitter/Makefile.in
+++ b/src/cal/jitter/Makefile.in
@@ -351,7 +351,7 @@ SUBDIRS = .
 cf_jitter_diag_SOURCES = cf_jitter_diag.c
 cf_jitter_SOURCES = cf_jitter.c
 LDADD = ../../libcf/libcf.la ../../slalib/libsla.la $(cfitsio_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/include -I./ -DCFORTRAN -Df2cFortran $(cfitsio_CFLAGS)
+AM_CFLAGS = -I$(srcdir)/include -I./ -DCFORTRAN -Df2cFortran $(cfitsio_CFLAGS)
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/fes/Makefile.am b/src/fes/Makefile.am
index ffeee17..b1a0365 100644
--- a/src/fes/Makefile.am
+++ b/src/fes/Makefile.am
@@ -5,4 +5,4 @@ cf_calfes_SOURCES = \
 		cf_fes_cal.c cf_fes_get_cal_image.c cf_limbang.c \
 		cf_fes_apply_bias.c cf_fes_apply_flat.c cf_fes_apply_mask.c
 cf_calfes_LDADD = ../slalib/libsla.la ../libcf/libcf.la
-cf_calfes_CFLAGS = -I$(top_srcdir)/include -I./
+cf_calfes_CFLAGS = -I$(srcdir)/include -I./
diff --git a/src/fes/Makefile.in b/src/fes/Makefile.in
index 2a1d28f..e8af491 100644
--- a/src/fes/Makefile.in
+++ b/src/fes/Makefile.in
@@ -358,7 +358,7 @@ cf_calfes_SOURCES = \
 		cf_fes_apply_bias.c cf_fes_apply_flat.c cf_fes_apply_mask.c
 
 cf_calfes_LDADD = ../slalib/libsla.la ../libcf/libcf.la
-cf_calfes_CFLAGS = -I$(top_srcdir)/include -I./
+cf_calfes_CFLAGS = -I$(srcdir)/include -I./
 all: all-recursive
 
 .SUFFIXES:
diff --git a/src/libcf/Makefile.am b/src/libcf/Makefile.am
index d59fc62..1c1d86f 100644
--- a/src/libcf/Makefile.am
+++ b/src/libcf/Makefile.am
@@ -34,5 +34,7 @@ libcf_la_SOURCES = \
 libcf_la_LDFLAGS = -lm -lgfortran
 libcf_la_CFLAGS = $(cfitsio_CFLAGS)
 libcf_la_LIBADD = $(cfitsio_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/include
+#AM_CFLAGS = -I$(srcdir)/include
+#AM_CFLAGS = -I$(pkgincludedir)/include
+AM_CFLAGS = -I$(srcdir)/include
 
diff --git a/src/libcf/Makefile.in b/src/libcf/Makefile.in
index c04b91d..2b0fcfd 100644
--- a/src/libcf/Makefile.in
+++ b/src/libcf/Makefile.in
@@ -411,7 +411,9 @@ libcf_la_SOURCES = \
 libcf_la_LDFLAGS = -lm -lgfortran
 libcf_la_CFLAGS = $(cfitsio_CFLAGS)
 libcf_la_LIBADD = $(cfitsio_LIBS)
-AM_CFLAGS = -I$(top_srcdir)/include
+#AM_CFLAGS = -I$(srcdir)/include
+#AM_CFLAGS = -I$(pkgincludedir)/include
+AM_CFLAGS = -I$(srcdir)/include
 all: all-am
 
 .SUFFIXES: