summaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorGravatar Edward Rudd 2004-01-20 16:27:35 +0000
committerGravatar Edward Rudd 2004-01-20 16:27:35 +0000
commit40f0c8fe04858acd724d6221dbf8a357259e5d6b (patch)
treec3effb1a7fa38e47152417830ab1c7480bddf703 /Makefile.in
parent417afc1671669fc9ba79410546c6ddfe242f2f4a (diff)
split out version specific code
code compiles under apache 1.3 and 2.0 updated apache m4 script to detect both verions (two minumums) defaulted install to not activate module in configuration file (use make activate)
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in35
1 files changed, 19 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in
index 7a77d6d..27ba01f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ LDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
15 15
16EXTRA_DIST = INSTALL LICENSE CHANGELOG make_combined_log.pl 16EXTRA_DIST = INSTALL LICENSE CHANGELOG make_combined_log.pl
17 17
18TARGET = @PACKAGE_NAME@.la 18TARGET = @APACHE_OUTPUT_NAME@
19 19
20#Don't modify anything below here 20#Don't modify anything below here
21 21
@@ -44,7 +44,7 @@ DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS)
44 44
45all: $(TARGET) all-subdirs 45all: $(TARGET) all-subdirs
46 46
47all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs: 47all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs:
48 @otarget=`echo $@|sed s/-subdirs//`; \ 48 @otarget=`echo $@|sed s/-subdirs//`; \
49 list=' $(PROVIDERS_SUBDIRS) $(SUBDIRS)'; \ 49 list=' $(PROVIDERS_SUBDIRS) $(SUBDIRS)'; \
50 for i in $$list; do \ 50 for i in $$list; do \
@@ -57,28 +57,30 @@ all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs:
57 fi; \ 57 fi; \
58 (cd $$i && $(MAKE) $$target) || exit 1; \ 58 (cd $$i && $(MAKE) $$target) || exit 1; \
59 fi; \ 59 fi; \
60 done; \ 60 done;
61 61
62$(TARGET): 62$(TARGET):
63 @APXS_BIN@ -c -o @PACKAGE_NAME@.la $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) $(LDADD) @DEFS@ $(SOURCES) 63 @@APXS_BIN@ -c -o $(TARGET) $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) \
64 $(LDADD) @DEFS@ @APACHE_DEFS@ $(SOURCES)
64 65
65include: 66include:
66 rm -rf include 67 rm -rf include
67 ln -s @APACHE_INCDIR@ include 68 ln -s @APACHE_INCDIR@ include
68 69
69install: install-subdirs 70install: install-subdirs
70 @APXS_BIN@ -i -a $(TARGET) 71 @@APXS_BIN@ -i $(TARGET)
71 72
72update: update-subdirs 73activate: activate-subdirs
73 @APXS_BIN@ -i $(TARGET) 74 @@APXS_BIN@ -i -a $(TARGET)
74 75
75clean: clean-subdirs 76clean: clean-subdirs
76 $(RM) $(OBJ) $(SLO) $(LO) $(TARGET) .deps 77 $(RM) $(OBJ) $(SLO) $(LO) $(TARGET) .deps
78 $(RM) -r .libs
77 79
78distclean: clean distclean-subdirs 80distclean: clean distclean-subdirs
79 $(RM) config.status config.log config.h config.h.in \ 81 $(RM) config.status config.log config.h config.h.in \
80 configure stamp-h stamp-h.in Makefile aclocal.m4 82 configure stamp-h stamp-h.in Makefile aclocal.m4
81 $(RM) -r autom4te-2.53.cache .libs 83 $(RM) -r autom4te-2.53.cache
82 84
83DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@ 85DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@
84DESTTGZ = $(DESTDIR).tar.gz 86DESTTGZ = $(DESTDIR).tar.gz
@@ -97,27 +99,28 @@ dist:
97 echo $(NEWDESTDIR); \ 99 echo $(NEWDESTDIR); \
98 (cd $$i && $(MAKE) DESTDIR=$(builddir)/$(DESTDIR)/$$i $$target) || exit 1; \ 100 (cd $$i && $(MAKE) DESTDIR=$(builddir)/$(DESTDIR)/$$i $$target) || exit 1; \
99 fi; \ 101 fi; \
100 done; 102 done; \
101 if test "$$made_local" != "yes"; then \ 103 if test "$$made_local" != "yes"; then \
102 $(MAKE) "local-dist" || exit 1; \ 104 $(MAKE) "local-dist" || exit 1; \
103 fi 105 fi; \
104 tar -zcf $(DESTTGZ) $(DESTDIR) 106 tar -zcf $(DESTTGZ) $(DESTDIR); \
105 rm -rf $(DESTDIR) 107 rm -rf $(DESTDIR); \
106 108
107local-dist: $(DISTFILES) 109local-dist: $(DISTFILES)
108 mkdir -p $(DESTDIR) 110 @mkdir -p $(DESTDIR); \
109 cp -dp --parents $(DISTFILES) $(DESTDIR) 111 cp -dp --parents $(DISTFILES) $(DESTDIR);
110 112
111$(builddir)/.deps: depend 113$(builddir)/.deps: depend
112 114
113depend: $(SOURCES) $(HEADERS) 115depend: $(SOURCES) $(HEADERS)
114 if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \ 116 if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
115 $(CC) -MM -I@APACHE_INCDIR@ @MOD_SSL_CFLAGS@ $(INCLUDES) -DHAVE_CONFIG_H $(srcdir)/*.c > $(builddir)/.deps || true; \ 117 $(CC) -MM -I@APACHE_INCDIR@ @MOD_SSL_CFLAGS@ $(INCLUDES) @DEFS@ \
118 @APACHE_DEFS@ $(srcdir)/*.c > $(builddir)/.deps || true; \
116 fi 119 fi
117 120
118include $(builddir)/.deps 121include $(builddir)/.deps
119 122
120.PHONY: include all-subdirs update-subdirs install-subdirs \ 123.PHONY: include all-subdirs activate-subdirs install-subdirs \
121 clean-subdirs distclean-subdirs dist 124 clean-subdirs distclean-subdirs dist
122 125
123# Regenerate makefiles 126# Regenerate makefiles