Some build stuffHEADmaster

5 files changed, 5 insertions, 56 deletions

diff --git a/configure.ac b/configure.ac
index e11e1bc..55c72f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,18 +207,9 @@ AC_ARG_ENABLE([debug],
 	[enable_debug="$enableval"],
 	[enable_debug=no]
 )
-AC_ARG_ENABLE([full-debug],
-	[AS_HELP_STRING([--enable-full-debug], [Turn on debugging and debug files' creation ])],
-	[enable_full_debug="$enableval"],
-	[enable_full_debug=no]
-)
-AS_IF([test "x$enable_full_debug" = "xyes"],
-	[ DEBUG_CXXFLAGS="-DDEBUG -DDEBUG_WITH_FILES -g" ],
-	[ AS_IF([test "x$enable_debug" = "xyes"],
-		[DEBUG_CXXFLAGS="-DDEBUG -g"],
-		[DEBUG_CXXFLAGS="-DNDEBUG"])
-	]
-)
+AS_IF([test "x$enable_debug" = "xyes"],
+	[DEBUG_CXXFLAGS="-DDEBUG -g"],
+	[DEBUG_CXXFLAGS="-DNDEBUG"])
 AC_SUBST(DEBUG_CXXFLAGS)
 
 # =============
@@ -261,7 +252,6 @@ docs/doxygen/Makefile
 build/Makefile
 build/win32/Makefile
 libsdw-$SDW_MAJOR_VERSION.$SDW_MINOR_VERSION.pc:libsdw.pc.in
-libsdw-zip
 ])
 AC_OUTPUT
 
@@ -272,7 +262,6 @@ AC_MSG_NOTICE([
 ==============================================================================
 Build configuration:
 	debug:           ${enable_debug}
-	full-debug:      ${enable_full_debug}
 	docs:            ${build_docs}
 	tools:           ${enable_tools}
 	werror:          ${enable_werror}
diff --git a/src/conv/html/Makefile.am b/src/conv/html/Makefile.am
index 8c13ff3..c8be2ea 100644
--- a/src/conv/html/Makefile.am
+++ b/src/conv/html/Makefile.am
@@ -6,21 +6,10 @@ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_GENERATORS_CFLAGS)
 
 sdw2html_DEPENDENCIES = @SDW2HTML_WIN32_RESOURCE@
 
-if STATIC_TOOLS
-
-sdw2html_LDADD = \
-	../../lib/@SDW_OBJDIR@/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.a \
-	$(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @SDW2HTML_WIN32_RESOURCE@
-sdw2html_LDFLAGS = -all-static
-
-else	
-
 sdw2html_LDADD = \
 	../../lib/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.la \
 	$(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @SDW2HTML_WIN32_RESOURCE@
 
-endif
-
 sdw2html_SOURCES = \
 	sdw2html.cpp
 
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index b177132..cc407fe 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -6,21 +6,10 @@ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_GENERATORS_CFLAGS)
 
 sdw2raw_DEPENDENCIES = @SDW2RAW_WIN32_RESOURCE@
 
-if STATIC_TOOLS
-
-sdw2raw_LDADD = \
-	../../lib/@SDW_OBJDIR@/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.a \
-	$(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @SDW2RAW_WIN32_RESOURCE@
-sdw2raw_LDFLAGS = -all-static
-
-else	
-
 sdw2raw_LDADD = \
 	../../lib/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.la \
 	$(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @SDW2RAW_WIN32_RESOURCE@
 
-endif
-
 sdw2raw_SOURCES = \
 	sdw2raw.cpp
 
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 941468a..ae54b2d 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -6,21 +6,10 @@ AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_GENERATORS_CFLAGS)
 
 sdw2text_DEPENDENCIES = @SDW2TEXT_WIN32_RESOURCE@
 
-if STATIC_TOOLS
-
-sdw2text_LDADD = \
-	../../lib/@SDW_OBJDIR@/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.a \
-	$(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @SDW2TEXT_WIN32_RESOURCE@
-sdw2text_LDFLAGS = -all-static
-
-else	
-
 sdw2text_LDADD = \
 	../../lib/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.la \
 	$(REVENGE_LIBS) $(REVENGE_GENERATORS_LIBS) $(REVENGE_STREAM_LIBS) @SDW2TEXT_WIN32_RESOURCE@
 
-endif
-
 sdw2text_SOURCES = \
 	sdw2text.cpp
 
diff --git a/src/lib/SDWDocument.cpp b/src/lib/SDWDocument.cpp
index e66b09b..a8f3fd5 100644
--- a/src/lib/SDWDocument.cpp
+++ b/src/lib/SDWDocument.cpp
@@ -14,19 +14,12 @@
 
 /**
 \mainpage libsdw documentation
-This document contains both the libsdw API specification and the normal libsdw
-documentation.
-\section api_docs libsdw API documentation
-The external libsdw API is provided by the SDWDocument class. This class, combined
-with the librevenge::RVNGTextInterface class, are the only two classes that will be
-of interest for the application programmer using libsdw.
-\section lib_docs libsdw documentation
+This document contains the normal libsdw documentation.
 If you are interrested in the structure of libsdw itself, this whole document
 would be a good starting point for exploring the interals of libsdw. Mind that
 this document is a work-in-progress, and will most likely not cover libsdw for
 the full 100%.
-
- \warning When compiled with -DDEBUG_WITH__FILES, code is added to store the results of the parsing in different files: one file by Ole parts and some files to store the read pictures. These files are created in the current repository, therefore it is recommended to launch the tests in an empty repository...*/
+*/
 
 /**
 Analyzes the content of an input stream to see if it can be parsed