Initial work on CMake support for SimGear.

[simgear.git] / simgear / xml / Makefile.am

diff --git a/simgear/xml/Makefile.am b/simgear/xml/Makefile.am
index bc01b91ba97582589d29415738f634589b534121..274f97ecbfb3ae560bca38a4594997d4019d958b 100644 (file)
--- a/simgear/xml/Makefile.am
+++ b/simgear/xml/Makefile.am
@@ -1,11 +1,5 @@
 includedir = @includedir@/xml
 
-if HAVE_ZLIB
-ZLIB_INCL =
-else
-ZLIB_INCL = -I$(top_srcdir)/src/zlib
-endif
-
 lib_LIBRARIES = libsgxml.a
 
 include_HEADERS = \
@@ -15,7 +9,7 @@ noinst_HEADERS = \
        xmltok_impl.c xmltok_ns.c
 
 libsgxml_a_SOURCES = \
-        asciitab.h \
+       asciitab.h \
        easyxml.cxx \
        hashtable.h hashtable.c \
        iasciitab.h latin1tab.h nametab.h utf8tab.h xmldef.h \
@@ -24,8 +18,4 @@ libsgxml_a_SOURCES = \
        xmltok.h xmltok.c \
        xmltok_impl.h
 
-if OLD_AUTOMAKE
-INCLUDES += -I$(top_srcdir) $(ZLIB_INCL)
-else
-INCLUDES = -I$(top_srcdir) $(ZLIB_INCL)
-endif
+INCLUDES = -I$(top_srcdir)