Description: Clean up brain damage in the build system.
Author: Roberto C. Sanchez <roberto@connexer.com>
--- trunk.orig/examples/ordermatch/test/Makefile.am
+++ trunk/examples/ordermatch/test/Makefile.am
@@ -1,5 +1,5 @@
 CFLAGS += -O0 -g
-CXXFLAGS += -O0 -g
+AM_CXXFLAGS = -O0 -g
 
 noinst_PROGRAMS = ordermatch_ut
 
@@ -11,4 +11,4 @@
 ordermatch_ut_LDADD = -L$(top_builddir)/src/C++ -lquickfix 
 
 INCLUDES = -I$(top_builddir)/include -I.. -I../../../UnitTest++/src
-LDFLAGS = -L../../../UnitTest++ -lUnitTest++
\ No newline at end of file
+AM_LDFLAGS = -L../../../UnitTest++ -lUnitTest++
--- trunk.orig/src/C++/test/Makefile.am
+++ trunk/src/C++/test/Makefile.am
@@ -1,5 +1,5 @@
 CFLAGS += -O0 -g
-CXXFLAGS += -O0 -g
+AM_CXXFLAGS = -O0 -g
 
 noinst_LTLIBRARIES = libquickfixcpptest.la
 
--- trunk.orig/src/Makefile.am
+++ trunk/src/Makefile.am
@@ -21,7 +21,7 @@
 pt_LDADD = C++/libquickfix.la
 
 INCLUDES =-IC++ -IC++/test -I../UnitTest++/src
-LDFLAGS =-L../UnitTest++ -lUnitTest++
+AM_LDFLAGS =-L../UnitTest++ -lUnitTest++
 
 all-local:
 	rm -f ../test/ut ../test/pt ../test/at ../test/ut_debug
--- trunk.orig/src/python/Makefile.am
+++ trunk/src/python/Makefile.am
@@ -25,35 +25,10 @@
 	rm -rf $(top_builddir)/lib/python
 
 install-exec-local:
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.so
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.dylib
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix40.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix41.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix42.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix43.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix44.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp1.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp2.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfixt11.py
-	ln -sf $(prefix)/lib/python/_quickfix.so $(PYTHON_SITE_PACKAGES)/_quickfix.so
-	ln -sf $(prefix)/lib/python/_quickfix.dylib $(PYTHON_SITE_PACKAGES)/_quickfix.dylib
-	cp $(top_builddir)/lib/python/*.py $(PYTHON_SITE_PACKAGES)
-
-uninstall-local:
-	rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.so
-	rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.dylib
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix40.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix41.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix42.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix43.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix44.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50sp1.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50sp2.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfixt11.py
+	mkdir -p $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+	ln -sf $(prefix)/lib/python/_quickfix.so $(DESTDIR)$(PYTHON_SITE_PACKAGES)/_quickfix.so
+	ln -sf $(prefix)/lib/python/_quickfix.dylib $(DESTDIR)$(PYTHON_SITE_PACKAGES)/_quickfix.dylib
+	cp $(top_builddir)/lib/python/*.py $(DESTDIR)$(PYTHON_SITE_PACKAGES)
 
 libquickfix_python_la_LDFLAGS = -version-info 10:0:0
 libquickfix_python_la_LIBADD = $(top_builddir)/src/C++/libquickfix.la 
--- trunk.orig/src/python/Makefile.in
+++ trunk/src/python/Makefile.in
@@ -594,35 +594,10 @@
 	rm -rf $(top_builddir)/lib/python
 
 install-exec-local:
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.so
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/_quickfix.dylib
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix40.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix41.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix42.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix43.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix44.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp1.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfix50sp2.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/python/quickfixt11.py
-	ln -sf $(prefix)/lib/python/_quickfix.so $(PYTHON_SITE_PACKAGES)/_quickfix.so
-	ln -sf $(prefix)/lib/python/_quickfix.dylib $(PYTHON_SITE_PACKAGES)/_quickfix.dylib
-	cp $(top_builddir)/lib/python/*.py $(PYTHON_SITE_PACKAGES)
-
-uninstall-local:
-	rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.so
-	rm -rf $(PYTHON_SITE_PACKAGES)/_quickfix.dylib
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix40.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix41.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix42.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix43.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix44.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50sp1.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfix50sp2.py
-	rm -rf $(PYTHON_SITE_PACKAGES)/quickfixt11.py
+	mkdir -p $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+	ln -sf $(prefix)/lib/python/_quickfix.so $(DESTDIR)$(PYTHON_SITE_PACKAGES)/_quickfix.so
+	ln -sf $(prefix)/lib/python/_quickfix.dylib $(DESTDIR)$(PYTHON_SITE_PACKAGES)/_quickfix.dylib
+	cp $(top_builddir)/lib/python/*.py $(DESTDIR)$(PYTHON_SITE_PACKAGES)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.