Commit c6a965b4d312c5c034c6ae9562ee82a9ce8c8fae
2018-01-21T14:29:58
[unix] Call libtool to clean up. * builds/unix/install.mk (clean_project_unix, distclean_project_unix): Use libtool. * builds/freetype.mk: Minor.
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 51 52 53 54 55
diff --git a/ChangeLog b/ChangeLog
index c9d5be1..8b3b75c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-01-21 Alexei Podtelezhnikov <apodtele@gmail.com>
+
+ [unix] Call libtool to clean up.
+
+ * builds/unix/install.mk (clean_project_unix, distclean_project_unix):
+ Use libtool.
+ * builds/freetype.mk: Minor.
+
2018-01-18 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/base/ftver.rc: Fix mingw-w64 compilation.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index 447b4a3..6f68a0f 100644
--- a/builds/freetype.mk
+++ b/builds/freetype.mk
@@ -345,10 +345,9 @@ remove_ftmodule_h:
.PHONY: clean distclean
-# The `config.mk' file must define `clean_freetype' and
-# `distclean_freetype'. Implementations may use to relay these to either
-# the `std' or `dos' versions from above, or simply provide their own
-# implementation.
+# The `config.mk' file must define `clean_project' and `distclean_project'.
+# Implementations may use to relay these to either the `std' or `dos'
+# versions from above, or simply provide their own implementation.
#
clean: clean_project
distclean: distclean_project remove_config_mk remove_ftmodule_h
diff --git a/builds/unix/install.mk b/builds/unix/install.mk
index 50325ca..d89064e 100644
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -88,13 +88,11 @@ check:
# Unix cleaning and distclean rules.
#
clean_project_unix:
- -$(DELETE) $(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)
- -$(DELETE) $(patsubst %.$O,%.$(SO),$(BASE_OBJECTS) $(OBJ_M) $(OBJ_S)) \
- $(CLEAN)
+ -$(LIBTOOL) --mode=clean $(RM) $(OBJECTS_LIST)
+ -$(DELETE) $(CLEAN)
distclean_project_unix: clean_project_unix
- -$(DELETE) $(PROJECT_LIBRARY)
- -$(DELDIR) $(OBJ_DIR)/.libs
+ -$(LIBTOOL) --mode=clean $(RM) $(PROJECT_LIBRARY)
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
# EOF