[packages/dumb.git] / dumb-shared.patch

--- dumb-0.9.3/make/unix.inc.orig	2005-08-08 02:18:40.000000000 +0200
+++ dumb-0.9.3/make/unix.inc	2013-03-31 22:26:03.606001233 +0200
@@ -11,6 +11,10 @@ FIX = $(1)
 ECHO = @echo $(1)
 DELETE = rm -f $(1)
 COPY = cp $(1) $(2)
+LIBTOOL = libtool
+COPY_BIN = $(LIBTOOL) --mode=install install $(1) $(2)
+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
 MKDIR = mkdir $(1)
 
 EXE_SUFFIX :=
--- dumb-0.9.3/make/Makefile.inc.orig	2005-08-08 02:18:40.000000000 +0200
+++ dumb-0.9.3/make/Makefile.inc	2013-03-31 22:31:29.732661102 +0200
@@ -2,8 +2,8 @@
 # twice with different values for CFLAGS and OBJDIR, so the optimised and
 # debugging libraries are both built.
 
-CORE_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.o, $(CORE_MODULES))))
-ALLEGRO_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.o, $(ALLEGRO_MODULES))))
+CORE_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.lo, $(CORE_MODULES))))
+ALLEGRO_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.lo, $(ALLEGRO_MODULES))))
 
 
 # Pass the current value of CFLAGS through to the commands. Or, more
@@ -14,26 +14,26 @@ $(CORE_LIB_FILE): CFLAGS := $(CFLAGS)
 $(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS)
 
 
-$(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/%.lo: src/core/%.c include/dumb.h include/internal/dumb.h
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: src/helpers/%.c include/dumb.h
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/%.lo: src/helpers/%.c include/dumb.h
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/resample.o: src/helpers/resample.inc src/helpers/resamp2.inc src/helpers/resamp3.inc
+$(OBJDIR)/resample.lo: src/helpers/resample.inc src/helpers/resamp2.inc src/helpers/resamp3.inc
 
-$(OBJDIR)/%.o: src/it/%.c include/dumb.h include/internal/it.h
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/%.lo: src/it/%.c include/dumb.h include/internal/it.h
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: src/sigtypes/%.c include/dumb.h
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/%.lo: src/sigtypes/%.c include/dumb.h
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/%.o: src/allegro/%.c include/aldumb.h include/dumb.h \
+$(OBJDIR)/%.lo: src/allegro/%.c include/aldumb.h include/dumb.h \
                       include/internal/aldumb.h include/internal/dumb.h
-	$(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $<
+	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $<
 
 $(CORE_LIB_FILE): $(CORE_OBJECTS)
-	$(AR) rs $@ $^
+	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LINK_MATH) -rpath $(LIB_INSTALL_PATH)
 
 $(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
-	$(AR) rs $@ $^
+	$(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(CORE_LIB_FILE) $(LINK_ALLEGRO) -rpath $(LIB_INSTALL_PATH)
--- dumb-0.9.3/Makefile.orig	2005-08-08 02:18:41.000000000 +0200
+++ dumb-0.9.3/Makefile	2013-03-31 22:26:27.906000727 +0200
@@ -22,7 +22,7 @@
 #                    (Note that this is unable to delete the dumbask
 #                    executable if the configuration is absent.)
 
-MAKEFILE = Makefile.rdy
+MAKEFILE = Makefile
 
 .PHONY: all install uninstall clean veryclean distclean config config-if-necessary make-outdirs
 
@@ -244,11 +244,11 @@ CORE_EXAMPLES_EXE := $(addprefix example
 ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES))))
 
 
-CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a
-ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a
+CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.la
+ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.la
 
-CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a
-ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
+CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.la
+ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.la
 
 
 core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
@@ -262,19 +262,19 @@ core-headers:
 allegro-headers:
 
 install-core: core
-	$(call COPY,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
-	$(call COPY,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
+	$(call COPY_BIN,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
+	$(call COPY_BIN,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
 
 install-allegro: allegro
-	$(call COPY,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
-	$(call COPY,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
+	$(call COPY_BIN,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
+	$(call COPY_BIN,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
 
 ifeq "$(COMSPEC)" ""
 install-core-examples: core-examples
-	$(call COPY,$(CORE_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
+	$(call COPY_BIN,$(CORE_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
 
 install-allegro-examples: allegro-examples
-	$(call COPY,$(ALLEGRO_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
+	$(call COPY_BIN,$(ALLEGRO_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
 else
 # Don't install the examples on a Windows system.
 install-core-examples:
@@ -317,22 +317,22 @@
 
 OBJDIR := $(OBJDIR_BASE)/release
 CFLAGS := $(CFLAGS_RELEASE)
-CORE_LIB_FILE := $(LIBDIR)/libdumb.a
-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
+CORE_LIB_FILE := $(LIBDIR)/libdumb.la
+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.la
 include make/Makefile.inc
 
 OBJDIR := $(OBJDIR_BASE)/debug
 CFLAGS := $(CFLAGS_DEBUG)
-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
+CORE_LIB_FILE := $(LIBDIR)/libdumbd.la
+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.la
 include make/Makefile.inc
 
 
 $(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
-	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
+	$(LIBTOOL_LINK) $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
 
 $(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE)
-	$(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
+	$(LIBTOOL_LINK) $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO) $(LINK_MATH)
 
 $(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h
 	$(CC) $(CFLAGS_RELEASE) -c $< -o $@
Commit	Line	Data
5ad428f3 JB	1	--- dumb-0.9.3/make/unix.inc.orig 2005-08-08 02:18:40.000000000 +0200
	2	+++ dumb-0.9.3/make/unix.inc 2013-03-31 22:26:03.606001233 +0200
	3	@@ -11,6 +11,10 @@ FIX = $(1)
	4	ECHO = @echo $(1)
	5	DELETE = rm -f $(1)
	6	COPY = cp $(1) $(2)
	7	+LIBTOOL = libtool
	8	+COPY_BIN = $(LIBTOOL) --mode=install install $(1) $(2)
	9	+LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC
	10	+LIBTOOL_COMPILE = $(LIBTOOL) --mode=compile --tag=CC
	11	MKDIR = mkdir $(1)
	12
	13	EXE_SUFFIX :=
	14	--- dumb-0.9.3/make/Makefile.inc.orig 2005-08-08 02:18:40.000000000 +0200
	15	+++ dumb-0.9.3/make/Makefile.inc 2013-03-31 22:31:29.732661102 +0200
	16	@@ -2,8 +2,8 @@
	17	# twice with different values for CFLAGS and OBJDIR, so the optimised and
	18	# debugging libraries are both built.
	19
	20	-CORE_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.o, $(CORE_MODULES))))
	21	-ALLEGRO_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.o, $(ALLEGRO_MODULES))))
	22	+CORE_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.lo, $(CORE_MODULES))))
	23	+ALLEGRO_OBJECTS := $(addprefix $(OBJDIR)/, $(notdir $(patsubst %.c, %.lo, $(ALLEGRO_MODULES))))
	24
	25
	26	# Pass the current value of CFLAGS through to the commands. Or, more
	27	@@ -14,26 +14,26 @@ $(CORE_LIB_FILE): CFLAGS := $(CFLAGS)
	28	$(ALLEGRO_LIB_FILE): CFLAGS := $(CFLAGS)
	29
	30
	31	-$(OBJDIR)/%.o: src/core/%.c include/dumb.h include/internal/dumb.h
	32	- $(CC) $(CFLAGS) -c -o $@ $<
	33	+$(OBJDIR)/%.lo: src/core/%.c include/dumb.h include/internal/dumb.h
	34	+ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
	35
	36	-$(OBJDIR)/%.o: src/helpers/%.c include/dumb.h
	37	- $(CC) $(CFLAGS) -c -o $@ $<
	38	+$(OBJDIR)/%.lo: src/helpers/%.c include/dumb.h
	39	+ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
	40
	41	-$(OBJDIR)/resample.o: src/helpers/resample.inc src/helpers/resamp2.inc src/helpers/resamp3.inc
	42	+$(OBJDIR)/resample.lo: src/helpers/resample.inc src/helpers/resamp2.inc src/helpers/resamp3.inc
	43
	44	-$(OBJDIR)/%.o: src/it/%.c include/dumb.h include/internal/it.h
	45	- $(CC) $(CFLAGS) -c -o $@ $<
	46	+$(OBJDIR)/%.lo: src/it/%.c include/dumb.h include/internal/it.h
	47	+ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
	48
	49	-$(OBJDIR)/%.o: src/sigtypes/%.c include/dumb.h
	50	- $(CC) $(CFLAGS) -c -o $@ $<
	51	+$(OBJDIR)/%.lo: src/sigtypes/%.c include/dumb.h
	52	+ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c -o $@ $<
	53
	54	-$(OBJDIR)/%.o: src/allegro/%.c include/aldumb.h include/dumb.h \
	55	+$(OBJDIR)/%.lo: src/allegro/%.c include/aldumb.h include/dumb.h \
	56	include/internal/aldumb.h include/internal/dumb.h
	57	- $(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $<
	58	+ $(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(WFLAGS_ALLEGRO) -c -o $@ $<
	59
	60	$(CORE_LIB_FILE): $(CORE_OBJECTS)
	61	- $(AR) rs $@ $^
	62	+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LINK_MATH) -rpath $(LIB_INSTALL_PATH)
	63
	64	$(ALLEGRO_LIB_FILE): $(ALLEGRO_OBJECTS)
65	- $(AR) rs $@ $^
66	+ $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(CORE_LIB_FILE) $(LINK_ALLEGRO) -rpath $(LIB_INSTALL_PATH)
67	--- dumb-0.9.3/Makefile.orig 2005-08-08 02:18:41.000000000 +0200
68	+++ dumb-0.9.3/Makefile 2013-03-31 22:26:27.906000727 +0200
69	@@ -22,7 +22,7 @@
70	# (Note that this is unable to delete the dumbask
71	# executable if the configuration is absent.)
72
73	-MAKEFILE = Makefile.rdy
74	+MAKEFILE = Makefile
75
76	.PHONY: all install uninstall clean veryclean distclean config config-if-necessary make-outdirs
77
78	@@ -244,11 +244,11 @@ CORE_EXAMPLES_EXE := $(addprefix example
79	ALLEGRO_EXAMPLES_EXE := $(addprefix examples/, $(notdir $(patsubst %.c, %$(EXE_SUFFIX), $(ALLEGRO_EXAMPLES))))
80
81
82	-CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.a
83	-ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.a
84	+CORE_LIB_FILE_RELEASE := $(LIBDIR)/libdumb.la
85	+ALLEGRO_LIB_FILE_RELEASE := $(LIBDIR)/libaldmb.la
86
87	-CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.a
88	-ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.a
89	+CORE_LIB_FILE_DEBUG := $(LIBDIR)/libdumbd.la
90	+ALLEGRO_LIB_FILE_DEBUG := $(LIBDIR)/libaldmd.la
91
92
93	core: $(CORE_LIB_FILE_RELEASE) $(CORE_LIB_FILE_DEBUG)
94	@@ -262,19 +262,19 @@ core-headers:
95	allegro-headers:
96
97	install-core: core
98	- $(call COPY,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
99	- $(call COPY,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
100	+ $(call COPY_BIN,$(CORE_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
101	+ $(call COPY_BIN,$(CORE_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
102
103	install-allegro: allegro
104	- $(call COPY,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
105	- $(call COPY,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
106	+ $(call COPY_BIN,$(ALLEGRO_LIB_FILE_RELEASE),$(LIB_INSTALL_PATH))
107	+ $(call COPY_BIN,$(ALLEGRO_LIB_FILE_DEBUG),$(LIB_INSTALL_PATH))
108
109	ifeq "$(COMSPEC)" ""
110	install-core-examples: core-examples
111	- $(call COPY,$(CORE_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
112	+ $(call COPY_BIN,$(CORE_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
113
114	install-allegro-examples: allegro-examples
115	- $(call COPY,$(ALLEGRO_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
116	+ $(call COPY_BIN,$(ALLEGRO_EXAMPLES_EXE),$(BIN_INSTALL_PATH))
117	else
118	# Don't install the examples on a Windows system.
119	install-core-examples:
120	@@ -317,22 +317,22 @@
121
122	OBJDIR := $(OBJDIR_BASE)/release
123	CFLAGS := $(CFLAGS_RELEASE)
124	-CORE_LIB_FILE := $(LIBDIR)/libdumb.a
125	-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.a
126	+CORE_LIB_FILE := $(LIBDIR)/libdumb.la
127	+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmb.la
128	include make/Makefile.inc
129
130	OBJDIR := $(OBJDIR_BASE)/debug
131	CFLAGS := $(CFLAGS_DEBUG)
132	-CORE_LIB_FILE := $(LIBDIR)/libdumbd.a
133	-ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.a
134	+CORE_LIB_FILE := $(LIBDIR)/libdumbd.la
135	+ALLEGRO_LIB_FILE := $(LIBDIR)/libaldmd.la
136	include make/Makefile.inc
137
138
139	$(CORE_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(CORE_LIB_FILE_RELEASE)
140	- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
141	+ $(LIBTOOL_LINK) $(CC) $^ -o $@ $(LDFLAGS) $(LINK_MATH)
142
143	$(ALLEGRO_EXAMPLES_EXE): examples/%$(EXE_SUFFIX): examples/%.o $(ALLEGRO_LIB_FILE_RELEASE) $(CORE_LIB_FILE_RELEASE)
144	- $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO)
145	+ $(LIBTOOL_LINK) $(CC) $^ -o $@ $(LDFLAGS) $(LINK_ALLEGRO) $(LINK_MATH)
146
147	$(CORE_EXAMPLES_OBJ): examples/%.o: examples/%.c include/dumb.h
148	$(CC) $(CFLAGS_RELEASE) -c $< -o $@