From 647487ca2c9834ae96cb3275a0b01d85cc62cca1 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Wed, 20 Sep 2006 20:04:09 +0000
Subject: [PATCH] Reverted makefile changes

---
 trunk/Makefile.am | 41 +++++++----------------------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/trunk/Makefile.am b/trunk/Makefile.am
index da607403..df6f2a00 100644
--- a/trunk/Makefile.am
+++ b/trunk/Makefile.am
@@ -90,11 +90,8 @@ libinclude_HEADERS = \
 ## Build test applications
 noinst_PROGRAMS = \
 	test/libburner \
-	test/burn \
 	test/iso \
-	test/master \
 	test/poll \
-	test/rip \
 	test/toc \
 	test/structest
 
@@ -110,15 +107,6 @@ test_poll_SOURCES = test/poll.c
 test_toc_CPPFLAGS = -Ilibburn
 test_toc_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 test_toc_SOURCES = test/toc.c
-test_rip_CPPFLAGS = -Ilibburn
-test_rip_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
-test_rip_SOURCES = test/rip.c
-test_burn_CPPFLAGS = -Ilibburn
-test_burn_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
-test_burn_SOURCES = test/burn.c
-test_master_CPPFLAGS = -Ilibburn
-test_master_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
-test_master_SOURCES = test/master.c
 test_structest_CPPFLAGS = -Ilibburn
 test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 test_structest_SOURCES = test/structest.c
@@ -146,26 +134,14 @@ docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 
 doc:	doc/html
 
-doc/html: doc/doxygen.conf
-	if [ -f ./doc/doc.lock ]; then \
-		$(RM) -r doc/html; \
-		doxygen doc/doxygen.conf; \
-	fi
+doc/html: 
+ $(RM) -r $@ 
+ doxygen doc/doxygen.conf 
 
 doc-upload: doc/html
 	scp -r $</* $(webhost):$(webpath)
 
-all: doc
-
-install-data-local: 
-	if [ -f ./doc/doc.lock ]; then \
-		$(mkinstalldirs) $(docdir)/html; \
-		$(INSTALL_DATA) doc/html/* $(docdir)/html; \
-	fi
-
-uninstall-local:
-	rm -rf $(docdir)
-
+.PHONY: doc 
 ## ========================================================================= ##
 
 # Indent source files
@@ -173,15 +149,11 @@ indent_files = \
 	$(libisofs_libisofs_la_SOURCES) \
 	$(libburn_libburn_la_SOURCES) \
 	$(test_libburner_SOURCES) \
-	$(test_devices_SOURCES) \
 	$(test_poll_SOURCES) \
 	$(test_toc_SOURCES) \
-	$(test_rip_SOURCES) \
-	$(test_burn_SOURCES) \
-	$(test_burniso_SOURCES) \
-	$(test_master_SOURCES) \
 	$(test_structest_SOURCES) \
-	$(test_blank_SOURCES)
+	$(test_iso_SOURCES)
+	
 
 indent: $(indent_files)
 	indent -bad -bap -nbbb -nbbo -nbc -bli0 -br -bls   \
@@ -207,6 +179,7 @@ EXTRA_DIST = \
 	doc/doxygen.conf.in \
 	README \
 	AUTHORS \
+	CONTRIBUTORS \
 	COPYRIGHT \
 	cdrskin/README \
 	cdrskin/cdrecord_spy.sh \