--- trunk/xvidcore/build/generic/Makefile	2003/02/11 21:56:31	830
+++ branches/dev-api-4/xvidcore/build/generic/Makefile	2003/05/22 18:58:18	1039
@@ -30,10 +30,6 @@
 #
 ##############################################################################
 
-# Our main targets
-STATIC_LIB=libxvidcore.$(STATIC_EXTENSION)
-SHARED_LIB=libxvidcore.$(SHARED_EXTENSION)
-
 # Their Objects
 OBJECTS=$(GENERIC_OBJECTS)
 OBJECTS+=$(DIVX4COMPAT_OBJECTS)
@@ -68,7 +64,7 @@
 
 .c.$(OBJECT_EXTENSION):
 	@echo -n "Compiling $< ... "
-	@$(CC) -c $(CFLAGS) $< -o $@
+	@$(CC) -c $(ARCHITECTURE) $(BUS) $(ENDIANNESS) $(FEATURES) $(SPECIFIC_CFLAGS) $(CFLAGS) $< -o $@
 	@echo "Done"
 
 #-----------------------------------------------------------------------------
@@ -102,11 +98,13 @@
 	@echo
 	@echo "+---------- Installing XviD libraries in $(libdir) ----------+"
 	@echo
+	$(INSTALL) -d $(libdir)
 	$(INSTALL) -m 755 $(SHARED_LIB) $(libdir)/$(SHARED_LIB)
 	$(INSTALL) -m 755 $(STATIC_LIB) $(libdir)/$(STATIC_LIB)
 	@echo
 	@echo "+---------- Installing XviD header in $(includedir) ----------+"
 	@echo
+	$(INSTALL) -d $(includedir)
 	$(INSTALL) -m 644 $(SRCDIR)/xvid.h $(includedir)/xvid.h
 	@echo
 
@@ -122,7 +120,7 @@
 # .PHONY targets
 #-----------------------------------------------------------------------------
 
-.PHONY: distclean clean info list-objects list-targets list-install-path
+.PHONY: mrproper distclean clean info list-objects list-targets list-install-path list-cflags
 
 clean:
 	@echo -n "Cleaning objects... "
@@ -135,15 +133,25 @@
 	@$(RM) $(SHARED_LIB)
 	@echo "Done"
 
-
 distclean: clean
 	@echo -n "Cleaning generated files... "
 	@$(RM) libxvidcore.def
 	@$(RM) platform.inc
 	@$(RM) config.log
+	@$(RM) config.status
 	@$(RM) autom4te.cache
 	@echo "Done"
 
+mrproper: distclean
+	@echo -n "Cleaning bootstrapped files... "
+	@$(RM) configure
+	@$(RM) install-sh
+	@$(RM) missing
+	@$(RM) config.guess
+	@$(RM) mkinstalldirs
+	@$(RM) config.sub
+	@echo "Done"
+
 list-objects:
 	@echo
 	@echo "Object files used for this build"
@@ -170,4 +178,12 @@
 	@echo Library: $(libdir)
 	@echo
 
-info: list-objects list-targets list-install-path
+list-cflags:
+	@echo
+	@echo "Using CFLAGS"
+	@echo "---------------------------------------------------------------"
+	@echo
+	@echo CFLAGS=$(CFLAGS)
+	@echo
+
+info: list-objects list-cflags list-targets list-install-path