Modified Files: libfcgi/Makefile.am examples/Makefile.am cgi-fcgi/Makefile.am

fix the handling of the include files ('make distcheck' now works)

diff --git a/cgi-fcgi/Makefile.am b/cgi-fcgi/Makefile.am
index e6a235a..4a5c685 100644 (file)
--- a/cgi-fcgi/Makefile.am
+++ b/cgi-fcgi/Makefile.am
@@ -1,8 +1,8 @@
-# $Id: Makefile.am,v 1.3 2001/09/24 18:03:03 skimo Exp $
+# $Id: Makefile.am,v 1.4 2001/12/22 03:16:22 robs Exp $
 bin_PROGRAMS     = cgi-fcgi
 
-INCLUDEDIR  = $(srcdir)/../include
-CPPFLAGS    = @CPPFLAGS@ -I$(INCLUDEDIR)
+INCLUDEDIR  = ../include
+CPPFLAGS    = @CPPFLAGS@ -I$(top_srcdir)/include
 
 INCLUDE_FILES   = $(INCLUDEDIR)/fastcgi.h  \
                  $(INCLUDEDIR)/fcgiapp.h  \

diff --git a/examples/Makefile.am b/examples/Makefile.am
index ba31611..484d3e8 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.7 2001/12/21 03:12:49 robs Exp $
+# $Id: Makefile.am,v 1.8 2001/12/22 03:16:21 robs Exp $
 
 noinst_PROGRAMS     = authorizer        \
                       echo              \
@@ -10,8 +10,8 @@ noinst_PROGRAMS     = authorizer        \
 
 EXTRA_PROGRAMS = threaded echo-cpp
 
-INCLUDEDIR  = $(srcdir)/../include
-CPPFLAGS    = @CPPFLAGS@ -I$(INCLUDEDIR)
+INCLUDEDIR  = ../include
+CPPFLAGS    = @CPPFLAGS@ -I$(top_srcdir)/include
 
 INCLUDE_FILES   = $(INCLUDEDIR)/fastcgi.h    \
                   $(INCLUDEDIR)/fcgiapp.h    \

diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am
index 336fb01..0f14615 100644 (file)
--- a/libfcgi/Makefile.am
+++ b/libfcgi/Makefile.am
@@ -1,7 +1,7 @@
-# $Id: Makefile.am,v 1.8 2001/12/21 03:12:48 robs Exp $
+# $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $
 
-INCLUDEDIR  = $(srcdir)/../include
-CPPFLAGS    = @CPPFLAGS@ -I$(INCLUDEDIR)
+INCLUDEDIR  = ../include
+CPPFLAGS    = @CPPFLAGS@ -I$(top_srcdir)/include
 
 INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h     \
                 $(INCLUDEDIR)/fcgiapp.h     \
@@ -16,10 +16,12 @@ libfcgi_la_SOURCES = $(INCLUDE_FILES)  \
                      fcgiapp.c         \
                      fcgi_stdio.c      \
                      os_@SYSTEM@.c
-
 libfcgi_la_CC      = @PTHREAD_CC@
 libfcgi_la_CFLAGS  = @PTHREAD_CFLAGS@
 
-libfcgi___la_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h fcgio.cpp
+libfcgi___la_SOURCES = $(INCLUDE_FILES)       \
+                       $(INCLUDEDIR)/fcgio.h  \
+                       fcgio.cpp
+libfcgi___la_CFLAGS  = @PTHREAD_CFLAGS@
 libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@