| 1 |
Clean up the build system: |
| 2 |
- Do NOT use anything outside the directory like an absolute /tmp |
| 3 |
- Use $(MAKE) to get parallel support |
| 4 |
- $(DESTDIR) fun |
| 5 |
- Disable the apache module install, do it from the ebuild |
| 6 |
|
| 7 |
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> |
| 8 |
|
| 9 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/Makefile OpenSRF-0.9/Makefile |
| 10 |
--- OpenSRF-0.9.orig/Makefile 2007-06-21 13:45:35.000000000 -0700 |
| 11 |
+++ OpenSRF-0.9/Makefile 2008-09-28 21:01:49.000000000 -0700 |
| 12 |
@@ -1,15 +1,18 @@ |
| 13 |
all: |
| 14 |
@echo -e "\n * Run 'make verbose' to see full make output\n" |
| 15 |
- source install.conf && make -s -C src all |
| 16 |
+ source install.conf && $(MAKE) -s -C src all |
| 17 |
|
| 18 |
verbose: |
| 19 |
- source install.conf && make -C src all |
| 20 |
+ source install.conf && $(MAKE) -C src all |
| 21 |
|
| 22 |
jserver: |
| 23 |
- source install.conf && make -s -C src jserver |
| 24 |
+ source install.conf && $(MAKE) -s -C src jserver |
| 25 |
|
| 26 |
install: |
| 27 |
- source install.conf && make -s -C src install |
| 28 |
+ source install.conf && $(MAKE) -s -C src install |
| 29 |
+ |
| 30 |
+install-verbose: |
| 31 |
+ source install.conf && $(MAKE) -C src install |
| 32 |
|
| 33 |
jserver-install: |
| 34 |
source install.conf && make -s -C src jserver-install |
| 35 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/Makefile OpenSRF-0.9/src/Makefile |
| 36 |
--- OpenSRF-0.9.orig/src/Makefile 2007-07-02 07:24:04.000000000 -0700 |
| 37 |
+++ OpenSRF-0.9/src/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 38 |
@@ -1,15 +1,17 @@ |
| 39 |
# TOP level 'src' makefile for OpenSRF |
| 40 |
|
| 41 |
|
| 42 |
-export TMPDIR = $(TMP)/opensrf |
| 43 |
export OPENSRF = opensrf |
| 44 |
export BINDIR = $(PREFIX)/bin |
| 45 |
export LIBDIR = $(PREFIX)/lib |
| 46 |
export PERLDIR = $(LIBDIR)/perl5 |
| 47 |
export INCLUDEDIR = $(PREFIX)/include |
| 48 |
|
| 49 |
+export BUILDDIR = ../../build |
| 50 |
+export BUILDDIR_SHALLOW = ../build |
| 51 |
export LDLIBS += |
| 52 |
-export LDFLAGS += -Wl,-rpath=$(LIBDIR) -L $(TMPDIR) -L . |
| 53 |
+export LDFLAGS += -Wl,-rpath=$(LIBDIR) -L $(BUILDDIR) -L . |
| 54 |
+export CFLAGS += -D_LARGEFILE64_SOURCE |
| 55 |
export CFLAGS += -pipe -g -Wall -O2 -fPIC -I ../../include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) \ |
| 56 |
-I$(LIBXML2_HEADERS)/libxml -I$(APR_HEADERS) |
| 57 |
|
| 58 |
@@ -35,31 +37,31 @@ |
| 59 |
# -------------------------------------------------------------------------------- |
| 60 |
|
| 61 |
prep: |
| 62 |
- mkdir -p $(TMPDIR) |
| 63 |
+ mkdir -p $(BUILDDIR_SHALLOW) |
| 64 |
|
| 65 |
objson/libobjson.so: prep |
| 66 |
@echo $@ |
| 67 |
- make -C objson |
| 68 |
+ $(MAKE) -C objson |
| 69 |
|
| 70 |
opensrf: objson/libobjson.so |
| 71 |
- make -C libopensrf |
| 72 |
- make -C c-apps |
| 73 |
+ $(MAKE) -C libopensrf |
| 74 |
+ $(MAKE) -C c-apps |
| 75 |
|
| 76 |
router: opensrf |
| 77 |
@echo $@ |
| 78 |
- make -C router |
| 79 |
+ $(MAKE) -C router |
| 80 |
|
| 81 |
srfsh: opensrf |
| 82 |
@echo $@ |
| 83 |
- make -C srfsh |
| 84 |
+ $(MAKE) -C srfsh |
| 85 |
|
| 86 |
gateway: opensrf |
| 87 |
@echo $@ |
| 88 |
- make -C gateway |
| 89 |
+ $(MAKE) -C gateway |
| 90 |
|
| 91 |
jserver: opensrf |
| 92 |
@echo $@ |
| 93 |
- make -C jserver |
| 94 |
+ $(MAKE) -C jserver |
| 95 |
|
| 96 |
|
| 97 |
# -------------------------------------------------------------------------------- |
| 98 |
@@ -69,60 +71,60 @@ |
| 99 |
# make sure the install directories exist |
| 100 |
install-prep: |
| 101 |
@echo $@ |
| 102 |
- mkdir -p $(LIBDIR) |
| 103 |
- mkdir -p $(BINDIR) |
| 104 |
- mkdir -p $(PERLDIR) |
| 105 |
- mkdir -p $(INCLUDEDIR) |
| 106 |
- mkdir -p $(ETCDIR) |
| 107 |
+ mkdir -p $(DESTDIR)$(LIBDIR) |
| 108 |
+ mkdir -p $(DESTDIR)$(BINDIR) |
| 109 |
+ mkdir -p $(DESTDIR)$(PERLDIR) |
| 110 |
+ mkdir -p $(DESTDIR)$(INCLUDEDIR) |
| 111 |
+ mkdir -p $(DESTDIR)$(ETCDIR) |
| 112 |
|
| 113 |
objson-install: install-prep |
| 114 |
@echo $@ |
| 115 |
- make -C objson install |
| 116 |
+ $(MAKE) -C objson install |
| 117 |
|
| 118 |
# installs libopensrf.so, opensrf-c, headers, example configs, and osrf_ctl.sh |
| 119 |
opensrf-install: objson-install |
| 120 |
@echo $@ |
| 121 |
- cp $(TMPDIR)/libopensrf.so $(LIBDIR)/libopensrf.so |
| 122 |
- cp -r ../include/opensrf $(INCLUDEDIR) |
| 123 |
- cp libopensrf/opensrf $(BINDIR)/opensrf-c |
| 124 |
- make -C c-apps install |
| 125 |
- cp ../bin/osrf_ctl.sh $(BINDIR) |
| 126 |
- cp ../examples/opensrf.xml.example $(ETCDIR) |
| 127 |
- cp ../examples/opensrf_core.xml.example $(ETCDIR) |
| 128 |
- cp ../examples/srfsh.xml.example $(ETCDIR) |
| 129 |
+ cp $(BUILDDIR_SHALLOW)/libopensrf.so $(DESTDIR)$(LIBDIR)/libopensrf.so |
| 130 |
+ cp -r ../include/opensrf $(DESTDIR)$(INCLUDEDIR) |
| 131 |
+ cp libopensrf/opensrf $(DESTDIR)$(BINDIR)/opensrf-c |
| 132 |
+ $(MAKE) -C c-apps install |
| 133 |
+ cp ../bin/osrf_ctl.sh $(DESTDIR)$(BINDIR) |
| 134 |
+ cp ../examples/opensrf.xml.example $(DESTDIR)$(ETCDIR) |
| 135 |
+ cp ../examples/opensrf_core.xml.example $(DESTDIR)$(ETCDIR) |
| 136 |
+ cp ../examples/srfsh.xml.example $(DESTDIR)$(ETCDIR) |
| 137 |
|
| 138 |
gateway-install: install-prep opensrf-install |
| 139 |
@echo $@ |
| 140 |
- make -C gateway install |
| 141 |
+ $(MAKE) -C gateway install |
| 142 |
|
| 143 |
router-install: install-prep opensrf-install |
| 144 |
@echo $@ |
| 145 |
- make -C router install |
| 146 |
+ $(MAKE) -C router install |
| 147 |
|
| 148 |
srfsh-install: install-prep opensrf-install |
| 149 |
@echo $@ |
| 150 |
- make -C srfsh install |
| 151 |
+ $(MAKE) -C srfsh install |
| 152 |
|
| 153 |
jserver-install: install-prep |
| 154 |
@echo $@ |
| 155 |
- make -C jserver install |
| 156 |
+ $(MAKE) -C jserver install |
| 157 |
|
| 158 |
perl-install: install-prep |
| 159 |
@echo $@ |
| 160 |
- cp -r perlmods/* $(PERLDIR)/ |
| 161 |
+ cp -r perlmods/* $(DESTDIR)$(PERLDIR)/ |
| 162 |
|
| 163 |
|
| 164 |
# -------------------------------------------------------------------------------- |
| 165 |
# CLEAN |
| 166 |
# -------------------------------------------------------------------------------- |
| 167 |
clean: |
| 168 |
- make -C libopensrf clean |
| 169 |
- make -C router clean |
| 170 |
- make -C gateway clean |
| 171 |
- make -C jserver clean |
| 172 |
- make -C objson clean |
| 173 |
- make -C srfsh clean |
| 174 |
- make -C c-apps clean |
| 175 |
- /bin/rm -rf $(TMPDIR) *.o |
| 176 |
+ $(MAKE) -C libopensrf clean |
| 177 |
+ $(MAKE) -C router clean |
| 178 |
+ $(MAKE) -C gateway clean |
| 179 |
+ $(MAKE) -C jserver clean |
| 180 |
+ $(MAKE) -C objson clean |
| 181 |
+ $(MAKE) -C srfsh clean |
| 182 |
+ $(MAKE) -C c-apps clean |
| 183 |
+ /bin/rm -rf $(BUILDDIR_SHALLOW) *.o |
| 184 |
|
| 185 |
|
| 186 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/c-apps/Makefile OpenSRF-0.9/src/c-apps/Makefile |
| 187 |
--- OpenSRF-0.9.orig/src/c-apps/Makefile 2005-09-12 06:33:26.000000000 -0700 |
| 188 |
+++ OpenSRF-0.9/src/c-apps/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 189 |
@@ -8,18 +8,18 @@ |
| 190 |
osrf_version.o: osrf_version.c |
| 191 |
|
| 192 |
osrf_math.so: osrf_math.o |
| 193 |
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_math.o -o $(TMPDIR)/osrf_math.so |
| 194 |
+ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_math.o -o osrf_math.so |
| 195 |
|
| 196 |
osrf_dbmath.so: osrf_dbmath.o |
| 197 |
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_dbmath.o -o $(TMPDIR)/osrf_dbmath.so |
| 198 |
+ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_dbmath.o -o osrf_dbmath.so |
| 199 |
|
| 200 |
osrf_version.so: osrf_version.o |
| 201 |
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_version.o -o $(TMPDIR)/osrf_version.so |
| 202 |
+ $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) osrf_version.o -o osrf_version.so |
| 203 |
|
| 204 |
install: |
| 205 |
- cp $(TMPDIR)/osrf_math.so $(LIBDIR)/ |
| 206 |
- cp $(TMPDIR)/osrf_dbmath.so $(LIBDIR)/ |
| 207 |
- cp $(TMPDIR)/osrf_version.so $(LIBDIR)/ |
| 208 |
+ cp osrf_math.so $(DESTDIR)$(LIBDIR) |
| 209 |
+ cp osrf_dbmath.so $(DESTDIR)$(LIBDIR) |
| 210 |
+ cp osrf_version.so $(DESTDIR)$(LIBDIR) |
| 211 |
|
| 212 |
clean: |
| 213 |
rm -f *.o *.so |
| 214 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/gateway/Makefile OpenSRF-0.9/src/gateway/Makefile |
| 215 |
--- OpenSRF-0.9.orig/src/gateway/Makefile 2006-04-14 08:17:22.000000000 -0700 |
| 216 |
+++ OpenSRF-0.9/src/gateway/Makefile 2008-09-28 21:03:01.000000000 -0700 |
| 217 |
@@ -2,14 +2,12 @@ |
| 218 |
CFLAGS += -DASSUME_STATELESS |
| 219 |
LDLIBS += -lobjson -lopensrf |
| 220 |
|
| 221 |
-all: osrf_json_gateway.so copy |
| 222 |
+all: osrf_json_gateway.so |
| 223 |
|
| 224 |
+#robbat2 - DISABLED, we will do this inside the ebuild |
| 225 |
install: |
| 226 |
- $(APXS2) -i -a -n osrf_json_gateway osrf_json_gateway.so |
| 227 |
- cp apachetools.h $(INCLUDEDIR)/opensrf/ |
| 228 |
- |
| 229 |
-copy: |
| 230 |
- cp apachetools.h $(TMPDIR) |
| 231 |
+ cp apachetools.h $(DESTDIR)$(INCLUDEDIR)/opensrf/ |
| 232 |
+# $(APXS2) -i -a -n osrf_json_gateway osrf_json_gateway.so |
| 233 |
|
| 234 |
apachetools.o: apachetools.h apachetools.c |
| 235 |
$(CC) -c $(CFLAGS) apachetools.c -o $@ |
| 236 |
@@ -17,9 +15,8 @@ |
| 237 |
osrf_json_gateway.o: osrf_json_gateway.c |
| 238 |
$(CC) -c $(CFLAGS) osrf_json_gateway.c -o $@ |
| 239 |
|
| 240 |
-osrf_json_gateway.so: copy apachetools.o osrf_json_gateway.o |
| 241 |
+osrf_json_gateway.so: apachetools.o osrf_json_gateway.o |
| 242 |
$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared -W1 apachetools.o osrf_json_gateway.o -o osrf_json_gateway.so |
| 243 |
|
| 244 |
- |
| 245 |
clean: |
| 246 |
/bin/rm -f *.o *.so |
| 247 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/jserver/Makefile OpenSRF-0.9/src/jserver/Makefile |
| 248 |
--- OpenSRF-0.9.orig/src/jserver/Makefile 2005-10-10 13:22:30.000000000 -0700 |
| 249 |
+++ OpenSRF-0.9/src/jserver/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 250 |
@@ -10,7 +10,7 @@ |
| 251 |
osrf_chat_main.o: osrf_chat_main.c |
| 252 |
|
| 253 |
install: |
| 254 |
- cp chopchop $(BINDIR) |
| 255 |
+ cp chopchop $(DESTDIR)$(BINDIR) |
| 256 |
|
| 257 |
clean: |
| 258 |
/bin/rm -f *.o chopchop |
| 259 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/libopensrf/Makefile OpenSRF-0.9/src/libopensrf/Makefile |
| 260 |
--- OpenSRF-0.9.orig/src/libopensrf/Makefile 2007-06-21 09:22:02.000000000 -0700 |
| 261 |
+++ OpenSRF-0.9/src/libopensrf/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 262 |
@@ -39,10 +39,9 @@ |
| 263 |
@echo $@ |
| 264 |
$(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -lopensrf opensrf.o -o $@ |
| 265 |
|
| 266 |
- |
| 267 |
# Build the OpenSRF library |
| 268 |
libopensrf.so: $(TARGETS) |
| 269 |
- $(CC) -shared -W1 $(LDFLAGS) $(LDLIBS) $(TARGETS) -o $(TMPDIR)/libopensrf.so |
| 270 |
+ $(CC) -shared -W1 $(LDFLAGS) $(LDLIBS) $(TARGETS) -o $(BUILDDIR)/libopensrf.so |
| 271 |
|
| 272 |
|
| 273 |
opensrf.o: opensrf.c |
| 274 |
@@ -70,4 +69,3 @@ |
| 275 |
|
| 276 |
clean: |
| 277 |
/bin/rm -f *.o libopensrf.so opensrf |
| 278 |
- |
| 279 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/objson/Makefile OpenSRF-0.9/src/objson/Makefile |
| 280 |
--- OpenSRF-0.9.orig/src/objson/Makefile 2007-06-21 09:19:20.000000000 -0700 |
| 281 |
+++ OpenSRF-0.9/src/objson/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 282 |
@@ -27,7 +27,7 @@ |
| 283 |
# -------------------------------------------------------------------- |
| 284 |
|
| 285 |
OBJS = utils.o json2xml.o object.o json_parser.o xml2json.o |
| 286 |
-CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5 |
| 287 |
+CFLAGS += -DSTRICT_JSON_WRITE -DOSRF_DISABLE_MD5 -I../../include |
| 288 |
TARGETS = object.o json_parser.o json2xml.o xml2json.o ../libopensrf/utils.o ../libopensrf/md5.o |
| 289 |
JSON_INC = ../../include/objson |
| 290 |
|
| 291 |
@@ -42,11 +42,11 @@ |
| 292 |
../libopensrf/md5.o: ../libopensrf/md5.c ../../include/opensrf/md5.h |
| 293 |
|
| 294 |
install: |
| 295 |
- cp -r ../../include/objson $(INCLUDEDIR) |
| 296 |
- cp $(TMPDIR)/libobjson.so $(LIBDIR)/libobjson.so |
| 297 |
+ cp -r ../../include/objson $(DESTDIR)$(INCLUDEDIR) |
| 298 |
+ cp $(BUILDDIR)/libobjson.so $(DESTDIR)$(LIBDIR)/libobjson.so |
| 299 |
|
| 300 |
libobjson.so: $(TARGETS) |
| 301 |
- $(CC) -shared -W1 $(TARGETS) -o $(TMPDIR)/libobjson.so |
| 302 |
+ $(CC) -shared -W1 $(TARGETS) -o $(BUILDDIR)/libobjson.so |
| 303 |
|
| 304 |
clean: |
| 305 |
/bin/rm -f *.o *.so |
| 306 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/router/Makefile OpenSRF-0.9/src/router/Makefile |
| 307 |
--- OpenSRF-0.9.orig/src/router/Makefile 2005-10-03 15:19:41.000000000 -0700 |
| 308 |
+++ OpenSRF-0.9/src/router/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 309 |
@@ -7,7 +7,7 @@ |
| 310 |
#osrf_router |
| 311 |
|
| 312 |
install: |
| 313 |
- cp opensrf_router $(BINDIR) |
| 314 |
+ cp opensrf_router $(DESTDIR)$(BINDIR) |
| 315 |
|
| 316 |
#opensrf_router: router.o |
| 317 |
# $(CC) $(CFLAGS) $(LDFLAGS) $(LDLIBS) router.o -o $@ |
| 318 |
diff -Nuar --exclude '*.orig' OpenSRF-0.9.orig/src/srfsh/Makefile OpenSRF-0.9/src/srfsh/Makefile |
| 319 |
--- OpenSRF-0.9.orig/src/srfsh/Makefile 2005-09-01 09:15:27.000000000 -0700 |
| 320 |
+++ OpenSRF-0.9/src/srfsh/Makefile 2008-09-28 21:00:08.000000000 -0700 |
| 321 |
@@ -9,7 +9,7 @@ |
| 322 |
srfsh.o: srfsh.c srfsh.h |
| 323 |
|
| 324 |
install: |
| 325 |
- cp srfsh $(BINDIR) |
| 326 |
+ cp srfsh $(DESTDIR)$(BINDIR) |
| 327 |
|
| 328 |
clean: |
| 329 |
/bin/rm -f *.o srfsh |
Parent Directory
| 
Revision Log