View | Details | Raw Unified | Return to bug 156269
Collapse All | Expand All

(-)files/patch-makefile.all (+91 lines)
Added Link Here
1 
--- makefile.all.orig	2011-04-07 20:16:34.097600083 +0100
2 
+++ makefile.all	2011-04-07 20:18:07.399413945 +0100
3 
@@ -234,42 +234,6 @@
4
5 
 # -------- rules for deleting the generated files --------
6
7 
-clean:
8 
-ifdef UNIX_TOOLS
9 
-	-rm $(RM_OPTS) $(OBJ_CLEAN_FILES)
10 
-	-rm $(RM_OPTS) $(OTHER_CLEAN_FILES)
11 
-else
12 
-   define RM_CLEAN
13 
-      $(foreach file, $(wildcard $(OBJ_CLEAN_FILES)), -del $(subst /,\,$(file))
14 
-      )
15 
-      $(foreach file, $(wildcard $(OTHER_CLEAN_FILES)), -del $(subst /,\,$(file))
16 
-      )
17 
-   endef
18 
-	-$(RM_CLEAN)
19 
-endif
20 
-
21 
-distclean: clean
22 
-ifdef UNIX_TOOLS
23 
-	-rm $(RM_OPTS) $(DISTCLEAN_FILES)
24 
-else
25 
-   define RM_DISTCLEAN
26 
-      $(foreach file, $(wildcard $(DISTCLEAN_FILES)), -del $(subst /,\,$(file))
27 
-      )
28 
-   endef
29 
-	-$(RM_DISTCLEAN)
30 
-endif
31 
-
32 
-veryclean: distclean
33 
-ifdef UNIX_TOOLS
34 
-	-rm $(RM_OPTS) $(VERYCLEAN_FILES)
35 
-else
36 
-   define RM_VERYCLEAN
37 
-      $(foreach file, $(wildcard $(VERYCLEAN_FILES)), -del $(subst /,\,$(file))
38 
-      )
39 
-   endef
40 
-	-$(RM_VERYCLEAN)
41 
-endif
42 
-
43
44
45 
 # -------- rules for installing and removing the generic library files --------
46 
@@ -292,15 +256,15 @@
47 
    INSTALL_DIRS := $(subst /,$(strip \),$(INSTALL_DIRS))
48 
 endif
49
50 
+define MKDIRS
51 
+$(foreach dir,$(INSTALL_DIRS),\
52 
+   misc\mdhelper.bat $(dir)
53 
+)
54 
+endef
55 
 create-install-dirs:
56 
 ifdef UNIX_TOOLS
57 
 	misc/mdhelper.sh $(INSTALL_DIRS)
58 
 else
59 
-   define MKDIRS
60 
-   $(foreach dir,$(INSTALL_DIRS),\
61 
-      misc\mdhelper.bat $(dir)
62 
-   )
63 
-   endef
64 
 	$(MKDIRS)
65 
 endif
66
67 
@@ -378,24 +342,6 @@
68 
         $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal/*.h \
69 
     )
70
71 
-generic-uninstall:
72 
-ifdef UNIX_TOOLS
73 
-	-rm -fv $(UNINSTALL_FILES)
74 
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/platform
75 
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/inline
76 
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro/internal
77 
-	-rmdir $(INSTALLDIR_U)/$(INCDIR_U)/allegro
78 
-else
79 
-   define RM_FILES
80 
-      $(foreach file, $(UNINSTALL_FILES), del $(subst /,\,$(file))
81 
-      )
82 
-   endef
83 
-	-$(RM_FILES)
84 
-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro\platform
85 
-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro\inline
86 
-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro\internal
87 
-	-rd $(INSTALLDIR_D)\$(INCDIR_D)\allegro
88 
-endif
89
90
91
(-)files/patch-makefile.in (-5 / +51 lines)
Lines 1-5 Link Here
1 
--- makefile.in.orig	Fri Jun 15 22:52:28 2007
 1 
--- allegro/work/allegro-4.2.2/makefile.in	2007-07-22 06:55:54.000000000 +0100
2 
+++ makefile.in	Fri Jul 13 14:52:12 2007
 2 
+++ makefile.in	2011-04-07 20:22:50.674897734 +0100
3 
@@ -29,11 +29,12 @@
 3 
@@ -29,11 +29,12 @@
4 
 INFO_DIR = $(infodir)/dir
 4 
 INFO_DIR = $(infodir)/dir
5 
 DESTDIR =
 5 
 DESTDIR =
Lines 15-21 Link Here
15 
 INSTALL_DATA = @INSTALL_DATA@
 15 
 INSTALL_DATA = @INSTALL_DATA@
16 
 INSTALL_INFO = @INSTALL_INFO@
 16 
 INSTALL_INFO = @INSTALL_INFO@
17
17
18 
@@ -352,6 +353,11 @@
 18 
@@ -353,6 +354,11 @@
19 
 endif
 19 
 endif
20
20
21 
 lib: $(ALLEGRO_LIB_TARGETS)
 21 
 lib: $(ALLEGRO_LIB_TARGETS)
Lines 27-33 Link Here
27
27
28 
 modules: $(ALLEGRO_MODULE_TARGETS)
 28 
 modules: $(ALLEGRO_MODULE_TARGETS)
29
29
30 
@@ -463,9 +469,9 @@
 30 
@@ -398,45 +404,6 @@
31
32 
 # -------- rules for deleting the generated files --------
33
34 
-clean:
35 
-
36 
-   define RM_OBJ_CLEAN_FILES
37 
-      $(foreach file, $(OBJ_CLEAN_FILES), rm -f $(file)
38 
-      )
39 
-   endef
40 
-
41 
-   define RM_OTHER_CLEAN_FILES
42 
-      $(foreach file, $(OTHER_CLEAN_FILES), rm -f $(file)
43 
-      )
44 
-   endef
45 
-
46 
-	$(RM_OBJ_CLEAN_FILES)
47 
-	$(RM_OTHER_CLEAN_FILES)
48 
-
49 
-distclean: clean
50 
-
51 
-   define RM_DISTCLEAN_FILES
52 
-      $(foreach file, $(DISTCLEAN_FILES) $(ALLEGRO_LIB_X_EXES), rm -f $(file)
53 
-      )
54 
-   endef
55 
-
56 
-	$(RM_DISTCLEAN_FILES)
57 
-
58 
-veryclean: distclean
59 
-
60 
-   define RM_VERYCLEAN_FILES
61 
-      $(foreach file, $(VERYCLEAN_FILES), rm -f $(file)
62 
-      )
63 
-   endef
64 
-
65 
-	$(RM_VERYCLEAN_FILES)
66 
-	rm -f makefile
67 
-
68 
-maintainer-clean: veryclean
69 
-	rm -f configure include/allegro/platform/alunixac.hin
70 
-	rm -rf autom4te*
71 
-
72 
-
73
74 
 # -------- rules for installing the files --------
75
76 
@@ -464,9 +431,9 @@
31 
 	  fi; \
 77 
 	  fi; \
32 
 	done
 78 
 	done
33 
 	@for l in alleg alld allp; do \
 79 
 	@for l in alleg alld allp; do \
Lines 40-46 Link Here
40 
 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
 86 
 	    $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
41 
 	  fi; \
 87 
 	  fi; \
42 
 	done
 88 
 	done
43 
@@ -479,20 +485,10 @@
 89 
@@ -480,20 +447,10 @@
44 
 	fi
 90 
 	fi
45 
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 91 
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
46 
 	@echo Installing allegro-config to $(DESTDIR)$(bindir)
 92 
 	@echo Installing allegro-config to $(DESTDIR)$(bindir)

Return to bug 156269