Making gcc call linker honors the Build ID. Additionaly we want compiler
flags only from RPM and we do want to install the result in libdir
no matter what architecture are we on.
--- hydrogen-0.9.3/plugins/wasp/Makefile.in.wasp 2005-11-10 20:39:20.000000000 +0100
+++ hydrogen-0.9.3/plugins/wasp/Makefile.in 2007-10-07 18:47:01.000000000 +0200
@@ -1,21 +1,20 @@
-INCLUDES = -I/usr/local/include/ -Iinclude
-CC = gcc
-CFLAGS = $(INCLUDES) -fPIC -DPIC -Wall -O2 -g -c
+INCLUDES = -Iinclude
+CFLAGS += $(INCLUDES) -nostartfiles -shared -fPIC -DPIC
+
prefix = @ac_prefix@
+exec_prefix = @prefix@
+libdir = @libdir@
all: wasp_booster.so wasp_noisifier.so wasp_xshaper.so
wasp_booster.so: plugins/booster.c
- $(CC) $(CFLAGS) -o plugins/booster.o plugins/booster.c
- ld -shared -o wasp_booster.so plugins/booster.o
+ $(CC) $(CFLAGS) -o wasp_booster.so plugins/booster.c
wasp_noisifier.so: plugins/noisifier.c
- $(CC) $(CFLAGS) -o plugins/noisifier.o plugins/noisifier.c
- ld -shared -o wasp_noisifier.so plugins/noisifier.o
+ $(CC) $(CFLAGS) -o wasp_noisifier.so plugins/noisifier.c
wasp_xshaper.so: plugins/x-shaper.c
- $(CC) $(CFLAGS) -o plugins/xshaper.o plugins/x-shaper.c
- ld -shared -o wasp_xshaper.so plugins/xshaper.o
+ $(CC) $(CFLAGS) -o wasp_xshaper.so plugins/x-shaper.c
clean:
@rm -f `find . -name "*.o"`
@@ -23,9 +22,9 @@
install:
@echo "Installing WASP plugins"
- mkdir -p $(DESTDIR)$(prefix)/lib/hydrogen/plugins/
- @install -vD *.so $(DESTDIR)$(prefix)/lib/hydrogen/plugins
+ mkdir -p $(DESTDIR)${libdir}/hydrogen/plugins/
+ @install -vD *.so $(DESTDIR)${libdir}/hydrogen/plugins
uninstall:
- @rm -rf $(DESTDIR)$(prefix)/lib/hydrogen
+ @rm -rf $(DESTDIR)${libdir}/hydrogen