From 487fa185e60e9007456312e72c6cfda611a139cb Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 2 Jun 2013 22:39:51 -0700 Subject: [PATCH] Whoops, don't want to build miniz.c directly --- Makefile.am | 2 +- Makefile.in | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 90212433..7caaa3ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,6 @@ libSDL2_image_la_SOURCES = \ IMG_xpm.c \ IMG_xv.c \ IMG_webp.c \ - miniz.c \ $(IMAGEIO_SOURCE) EXTRA_DIST = \ @@ -36,6 +35,7 @@ EXTRA_DIST = \ VisualCE \ Xcode \ Xcode-iOS \ + miniz.c \ IMG_xxx.c \ IMG_UIImage.m \ SDL2_image.spec \ diff --git a/Makefile.in b/Makefile.in index df41e8f3..2c101e92 100644 --- a/Makefile.in +++ b/Makefile.in @@ -112,13 +112,13 @@ LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = am__libSDL2_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c \ IMG_jpg.c IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c \ - IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c miniz.c \ + IMG_tif.c IMG_xcf.c IMG_xpm.c IMG_xv.c IMG_webp.c \ IMG_ImageIO.m @USE_IMAGEIO_TRUE@am__objects_1 = IMG_ImageIO.lo am_libSDL2_image_la_OBJECTS = IMG.lo IMG_bmp.lo IMG_gif.lo IMG_jpg.lo \ IMG_lbm.lo IMG_pcx.lo IMG_png.lo IMG_pnm.lo IMG_tga.lo \ IMG_tif.lo IMG_xcf.lo IMG_xpm.lo IMG_xv.lo IMG_webp.lo \ - miniz.lo $(am__objects_1) + $(am__objects_1) libSDL2_image_la_OBJECTS = $(am_libSDL2_image_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -389,7 +389,6 @@ libSDL2_image_la_SOURCES = \ IMG_xpm.c \ IMG_xv.c \ IMG_webp.c \ - miniz.c \ $(IMAGEIO_SOURCE) EXTRA_DIST = \ @@ -400,6 +399,7 @@ EXTRA_DIST = \ VisualCE \ Xcode \ Xcode-iOS \ + miniz.c \ IMG_xxx.c \ IMG_UIImage.m \ SDL2_image.spec \ @@ -536,7 +536,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xcf.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xpm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/IMG_xv.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/miniz.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/showimage.Po@am__quote@ .c.o: