diff options
Diffstat (limited to 'Build/source/libs/zziplib')
-rw-r--r-- | Build/source/libs/zziplib/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.am | 2 | ||||
-rw-r--r-- | Build/source/libs/zziplib/Makefile.in | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Build/source/libs/zziplib/ChangeLog b/Build/source/libs/zziplib/ChangeLog index c012bcec819..488c0d1fa20 100644 --- a/Build/source/libs/zziplib/ChangeLog +++ b/Build/source/libs/zziplib/ChangeLog @@ -1,3 +1,7 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (SUBDIRS): Build the library first. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. diff --git a/Build/source/libs/zziplib/Makefile.am b/Build/source/libs/zziplib/Makefile.am index 48da0a23854..52039a0d987 100644 --- a/Build/source/libs/zziplib/Makefile.am +++ b/Build/source/libs/zziplib/Makefile.am @@ -31,7 +31,7 @@ dist-hook: $(distdir)/$(ZZIPLIB_TREE)/zzip/_config.h \ $(distdir)/$(ZZIPLIB_TREE)/zzip/_msvc.h -SUBDIRS = include/zzip +SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES) AM_CPPFLAGS += $(ZZIPLIB_DEFINES) diff --git a/Build/source/libs/zziplib/Makefile.in b/Build/source/libs/zziplib/Makefile.in index 5f9b39e77c6..81a92201f5d 100644 --- a/Build/source/libs/zziplib/Makefile.in +++ b/Build/source/libs/zziplib/Makefile.in @@ -558,7 +558,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -I m4 EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES -SUBDIRS = include/zzip +SUBDIRS = . include/zzip AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \ $(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES) AM_CFLAGS = $(WARNING_CFLAGS) |