Merge "makefiles: prune get_disto & webp_quality deps"

This commit is contained in:
Pascal Massimino 2017-01-19 06:27:52 +00:00 committed by Gerrit Code Review
commit 9e14276f4c
3 changed files with 4 additions and 9 deletions

View File

@ -21,6 +21,6 @@ get_disto_LDADD += $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
webp_quality_SOURCES = webp_quality.c webp_quality_SOURCES = webp_quality.c
webp_quality_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE) webp_quality_CPPFLAGS = $(AM_CPPFLAGS) $(USE_EXPERIMENTAL_CODE)
webp_quality_LDADD = ../imageio/libimageio_util.la ../imageio/libimagedec.la webp_quality_LDADD = ../imageio/libimageio_util.la
webp_quality_LDADD += ./libwebpextras.la webp_quality_LDADD += ./libwebpextras.la
webp_quality_LDADD += ../src/libwebp.la $(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) webp_quality_LDADD += ../src/libwebp.la

View File

@ -4,8 +4,7 @@
// the bucket it's in (q > 80? > 50? > 20?) and not take it for face value. // the bucket it's in (q > 80? > 50? > 20?) and not take it for face value.
/* /*
gcc -o webp_quality webp_quality.c -O3 -I../ -L. -L../imageio \ gcc -o webp_quality webp_quality.c -O3 -I../ -L. -L../imageio \
-lexample_util -limagedec -lwebpextras -lwebp -L/opt/local/lib \ -limageio_util -lwebpextras -lwebp -lm -lpthread
-lpng -lz -ljpeg -ltiff -lm -lpthread
*/ */
#include <stdio.h> #include <stdio.h>

View File

@ -410,16 +410,12 @@ examples/img2webp: src/mux/libwebpmux.a src/libwebp.a
examples/img2webp: EXTRA_LIBS += $(CWEBP_LIBS) examples/img2webp: EXTRA_LIBS += $(CWEBP_LIBS)
extras/get_disto: extras/get_disto.o extras/get_disto: extras/get_disto.o
extras/get_disto: imageio/libimagedec.a extras/get_disto: imageio/libimagedec.a imageio/libimageio_util.a src/libwebp.a
extras/get_disto: imageio/libimageio_util.a
extras/get_disto: $(EXTRA_LIB) src/libwebp.a
extras/get_disto: EXTRA_LIBS += $(CWEBP_LIBS) extras/get_disto: EXTRA_LIBS += $(CWEBP_LIBS)
extras/webp_quality: extras/webp_quality.o extras/webp_quality: extras/webp_quality.o
extras/webp_quality: imageio/libimagedec.a
extras/webp_quality: imageio/libimageio_util.a extras/webp_quality: imageio/libimageio_util.a
extras/webp_quality: $(EXTRA_LIB) src/libwebp.a extras/webp_quality: $(EXTRA_LIB) src/libwebp.a
extras/get_disto: EXTRA_LIBS += $(CWEBP_LIBS)
$(OUT_EXAMPLES) $(EXTRA_EXAMPLES) $(OTHER_EXAMPLES): $(OUT_EXAMPLES) $(EXTRA_EXAMPLES) $(OTHER_EXAMPLES):
$(CC) -o $@ $^ $(LDFLAGS) $(CC) -o $@ $^ $(LDFLAGS)