1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Wed, 27 Oct 2010 23:17:40 +0200
Subject: [PATCH] fix buildsystem
* Use libfcgi.la instead of -lfcgi when linking against a library in the
same directory
* Use AM_* where appropriate.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
cgi-fcgi/Makefile.am | 2 +-
examples/Makefile.am | 4 ++--
libfcgi/Makefile.am | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cgi-fcgi/Makefile.am b/cgi-fcgi/Makefile.am
index 4a5c685..04b4483 100644
--- a/cgi-fcgi/Makefile.am
+++ b/cgi-fcgi/Makefile.am
@@ -2,7 +2,7 @@
bin_PROGRAMS = cgi-fcgi
INCLUDEDIR = ../include
-CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
+AM_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 484d3e8..930f203 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -11,7 +11,7 @@ noinst_PROGRAMS = authorizer \
EXTRA_PROGRAMS = threaded echo-cpp
INCLUDEDIR = ../include
-CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \
$(INCLUDEDIR)/fcgiapp.h \
@@ -34,5 +34,5 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@
threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp
-echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la
+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la
diff --git a/libfcgi/Makefile.am b/libfcgi/Makefile.am
index 0f14615..d7346f5 100644
--- a/libfcgi/Makefile.am
+++ b/libfcgi/Makefile.am
@@ -1,7 +1,7 @@
# $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $
INCLUDEDIR = ../include
-CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include
INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \
$(INCLUDEDIR)/fcgiapp.h \
@@ -23,5 +23,6 @@ libfcgi___la_SOURCES = $(INCLUDE_FILES) \
$(INCLUDEDIR)/fcgio.h \
fcgio.cpp
libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@
-libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@
+libfcgi___la_LDFLAGS = -rpath @libdir@
+libfcgi___la_LIBADD = libfcgi.la
--
1.7.2.3
|
