Commit 646db05dfda8856846d06ce341a9e706fb576bd8
2014-03-01T12:48:07
Make `make clean' remove `freetype2.pc'. This is a generated file at build time, not configure time. * builds/unix/unix-def.in (DISTCLEAN): Move `freetype2.pc' to ... (CLEAN): This variable.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/ChangeLog b/ChangeLog
index 9bf5d7e..c32fdba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2014-03-01 Werner Lemberg <wl@gnu.org>
+ Make `make clean' remove `freetype2.pc'.
+
+ This is a generated file at build time, not configure time.
+
+ * builds/unix/unix-def.in (DISTCLEAN): Move `freetype2.pc' to ...
+ (CLEAN): This variable.
+
+2014-03-01 Werner Lemberg <wl@gnu.org>
+
Use pkg-config for detecting libpng and libbz2 also.
* builds/unix/configure.raw (HAVE_PKG): New variable.
diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in
index 2e5f9e5..31d2441 100644
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -34,16 +34,16 @@ INSTALL_PROGRAM := @INSTALL_PROGRAM@
INSTALL_SCRIPT := @INSTALL_SCRIPT@
MKINSTALLDIRS := $(BUILD_DIR)/mkinstalldirs
-CLEAN += $(OBJ_BUILD)/freetype-config
-
-DISTCLEAN += $(OBJ_BUILD)/config.cache \
- $(OBJ_BUILD)/config.log \
- $(OBJ_BUILD)/config.status \
- $(OBJ_BUILD)/unix-def.mk \
- $(OBJ_BUILD)/unix-cc.mk \
- $(OBJ_BUILD)/ftconfig.h \
- $(OBJ_BUILD)/freetype2.pc \
- $(LIBTOOL) \
+CLEAN += $(OBJ_BUILD)/freetype-config \
+ $(OBJ_BUILD)/freetype2.pc
+
+DISTCLEAN += $(OBJ_BUILD)/config.cache \
+ $(OBJ_BUILD)/config.log \
+ $(OBJ_BUILD)/config.status \
+ $(OBJ_BUILD)/unix-def.mk \
+ $(OBJ_BUILD)/unix-cc.mk \
+ $(OBJ_BUILD)/ftconfig.h \
+ $(LIBTOOL) \
$(OBJ_BUILD)/Makefile