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