--- trunk/xvidcore/build/generic/Makefile	2004/03/22 22:36:25	1382
+++ trunk/xvidcore/build/generic/Makefile	2011/01/11 11:39:13	1944
@@ -1,21 +1,22 @@
 ##############################################################################
 #
-# - Unified Makefile for XviD for *nix environments -
+# - Unified Makefile for Xvid for *nix environments -
 #
-# Copyright(C) 2003 Edouard Gomez <ed.gomez@free.fr>
+# Copyright(C) 2003-2004 Edouard Gomez <ed.gomez@free.fr>
 #
 #
 # Description:
-#  This Makefile allows building XviD sources to obtain a shared library
+#  This Makefile allows building Xvid sources to obtain a shared library
 #  and a static library. This Makefile uses variables defined in the
 #  platform.inc file. This platform.inc file is usually created by the
 #  ./configure script whenever a unix shell is available.
 #
-# Makefile functionnal dependencies:
+# Makefile functional dependencies:
 #  - echo
 #  - rm (with option -r and -f)
 #  - cd
 #  - make VPATH support (eg: GNU make, solaris 8 make)
+#  - ar
 #
 # Building output:
 #  - C means "_C_ompiling"
@@ -54,8 +55,9 @@
 OBJECTS  = $(GENERIC_OBJECTS)
 OBJECTS += $(ASSEMBLY_OBJECTS)
 OBJECTS += $(DCT_IA64_OBJECTS)
+OBJECTS += $(PPC_ALTIVEC_OBJECTS)
 
-# The VPATH mecanism could use a "per target" build directory
+# The VPATH mechanism could use a "per target" build directory
 # To keep it simple at the moment, the directory is fixed to "build"
 BUILD_DIR = =build
 VPATH     = $(SRC_DIR):$(BUILD_DIR)
@@ -69,7 +71,7 @@
 all: $(STATIC_LIB) $(SHARED_LIB)
 	@echo
 	@echo "---------------------------------------------------------------"
-	@echo " XviD has been successfully built."
+	@echo " Xvid has been successfully built."
 	@echo
 	@echo " * Binaries are currently located in the '$(BUILD_DIR)' directory"
 	@echo " * To install them on your system, you can run '# make install'"
@@ -96,6 +98,8 @@
 # Generic C rule
 #-----------------------------------------------------------------------------
 
+$(PPC_ALTIVEC_OBJECTS): CFLAGS+= $(ALTIVEC_CFLAGS)
+
 .c.$(OBJECT_EXTENSION):
 	@echo "  C: $(@D)/$(<F)"
 	@$(INSTALL) -d $(BUILD_DIR)/$(@D)
@@ -107,7 +111,7 @@
 
 $(STATIC_LIB): $(BUILD_DIR) $(OBJECTS)
 	@echo "  L: $(@F)"
-	@cd $(BUILD_DIR) && ar rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
+	@cd $(BUILD_DIR) && $(AR) rc $(@F) $(OBJECTS) && $(RANLIB) $(@F)
 
 #-----------------------------------------------------------------------------
 # Shared Library
@@ -127,6 +131,7 @@
 $(SHARED_LIB): $(BUILD_DIR) $(OBJECTS)
 	@echo "  L: $(@F)"
 	@$(INSTALL) -m 644 libxvidcore.def $(BUILD_DIR)/libxvidcore.def
+	@$(INSTALL) -m 644 libxvidcore.ld $(BUILD_DIR)/libxvidcore.ld
 	@cd $(BUILD_DIR) && $(CC) $(LDFLAGS) $(OBJECTS) -o $(PRE_SHARED_LIB) $(SPECIFIC_LDFLAGS)
 
 #-----------------------------------------------------------------------------
@@ -135,15 +140,15 @@
 
 install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)
 	@echo "  D: $(libdir)"
-	@$(INSTALL) -d $(libdir)
+	@$(INSTALL) -d $(DESTDIR)$(libdir)
 	@echo "  I: $(libdir)/$(SHARED_LIB)"
-	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(libdir)/$(SHARED_LIB)
+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
 	@echo "  I: $(libdir)/$(STATIC_LIB)"
-	@$(INSTALL) -m 755 $(BUILD_DIR)/$(STATIC_LIB) $(libdir)/$(STATIC_LIB)
+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
 	@echo "  D: $(includedir)"
-	@$(INSTALL) -d $(includedir)
+	@$(INSTALL) -d $(DESTDIR)$(includedir)
 	@echo "  I: $(includedir)/xvid.h"
-	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(includedir)/xvid.h
+	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
 
 #-----------------------------------------------------------------------------
 # Platorm specific file -- dumb rules for people executing make before
@@ -175,7 +180,7 @@
 	@$(RM) autom4te.cache
 
 mrproper: distclean
-	@echo "  Cl: Boostrapped build files"
+	@echo "  Cl: Bootstrapped build files"
 	@$(RM) configure
 	@$(RM) install-sh
 	@$(RM) missing