[packages/libmatroska.git] / libmatroska-makefile.patch

--- libmatroska/make/linux/Makefile.djurban	2003-07-17 11:48:18.000000000 +0200
+++ libmatroska/make/linux/Makefile	2003-09-02 15:39:10.181661712 +0200
@@ -25,12 +25,14 @@
 INSTALL_OPTS = -m 644
 INSTALL_OPTS_LIB = -m 644
 INSTALL_DIR_OPTS = -m 755
+LIBTOOL = libtool
+
+LIBEBML_INCLUDE_DIR=
+LIBEBML_LIB_DIR=
 
 CWD=$(shell pwd)
 
 # Options
-LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
-LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
 EXTENSION=.cpp
 
 ifeq (yes,$(DEBUG))
@@ -47,10 +49,10 @@
 # Librarires
 INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
 LIBS=
-MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
 
 # Names
-LIBRARY=libmatroska.a
+LIBRARY=libmatroska.la
 
 # source-files
 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -61,24 +63,22 @@
 # files holding dependency information; replace .cxx extension with .dep
 dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
 
-# object files; replace .cxx extension with .o
-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+# object files; replace .cxx extension with .lo
+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
 
 DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
 
-all: $(LIBRARY) test
+all: $(LIBRARY)
 
 lib library: $(LIBRARY)
 
 # Build rules
-%.o: %$(EXTENSION)
-	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+%.lo: %$(EXTENSION)
+	$(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
 
 $(LIBRARY): $(objects)
-	$(AR) $@ $(objects)
-	$(RANLIB) $@
-#	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-#	${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
+	$(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
+
 
 clean:	cleantest
 	rm -f $(objects)
@@ -96,33 +96,33 @@
 test: test6 test8 test9
 
 test6:	test6.o $(LIBRARY)
-	$(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+	$(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)	
 
 test6.o: $(MUX_SRC_DIR)test6.cpp
 	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
 
 test8:	test8.o $(LIBRARY)
-	$(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+	$(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
 
 test8.o: $(MUX_SRC_DIR)test8.cpp
 	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
 
 test9:	test9.o $(LIBRARY)
-	$(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+	$(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
 
 test9.o: $(TAG_SRC_DIR)test9.cpp
 	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
 
 install: $(LIBRARY)
-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
-	$(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
 	for i in $(INCLUDE_DIR)/*.h; do \
-		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
 	done
-	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
+	$(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
 	for i in $(INCLUDE_DIR)/c/*.h; do \
-		$(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
+		$(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
 	done
 
 # DO NOT DELETE
Commit	Line	Data
298a82c1	1	--- libmatroska/make/linux/Makefile.djurban 2003-07-17 11:48:18.000000000 +0200
	2	+++ libmatroska/make/linux/Makefile 2003-09-02 15:39:10.181661712 +0200
	3	@@ -25,12 +25,14 @@
b57b5cf5 JB	4	INSTALL_OPTS = -m 644
	5	INSTALL_OPTS_LIB = -m 644
	6	INSTALL_DIR_OPTS = -m 755
	7	+LIBTOOL = libtool
298a82c1	8	+
	9	+LIBEBML_INCLUDE_DIR=
	10	+LIBEBML_LIB_DIR=
b57b5cf5	11
a2b44dd0	12	CWD=$(shell pwd)
	13
	14	# Options
298a82c1	15	-LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
a2b44dd0	16	-LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
a2b44dd0	17	EXTENSION=.cpp
a2b44dd0	18
298a82c1	19	ifeq (yes,$(DEBUG))
298a82c1	20	@@ -47,10 +49,10 @@
b57b5cf5	21	# Librarires
298a82c1	22	INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
b57b5cf5 JB	23	LIBS=
	24	-MUX_LIBS=-lmatroska -lebml $(LIBICONV)
	25	+MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
a2b44dd0	26
	27	# Names
	28	-LIBRARY=libmatroska.a
b57b5cf5	29	+LIBRARY=libmatroska.la
a2b44dd0	30
	31	# source-files
	32	sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
298a82c1	33	@@ -61,24 +63,22 @@
b57b5cf5 JB	34	# files holding dependency information; replace .cxx extension with .dep
	35	dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
	36
	37	-# object files; replace .cxx extension with .o
	38	-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
	39	+# object files; replace .cxx extension with .lo
	40	+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
a2b44dd0	41
	42	DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
	43
	44	-all: $(LIBRARY) test
	45	+all: $(LIBRARY)
	46
	47	lib library: $(LIBRARY)
	48
b57b5cf5 JB	49	# Build rules
	50	-%.o: %$(EXTENSION)
	51	- $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
	52	+%.lo: %$(EXTENSION)
	53	+ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
a2b44dd0	54
	55	$(LIBRARY): $(objects)
	56	- $(AR) $@ $(objects)
	57	- $(RANLIB) $@
	58	-# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
	59	-# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
b57b5cf5	60	+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
a2b44dd0	61	+
	62
	63	clean: cleantest
	64	rm -f $(objects)
298a82c1	65	@@ -96,33 +96,33 @@
298a82c1	66	test: test6 test8 test9
b57b5cf5 JB	67
	68	test6: test6.o $(LIBRARY)
	69	- $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
298a82c1	70	+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
b57b5cf5 JB	71
	72	test6.o: $(MUX_SRC_DIR)test6.cpp
	73	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
	74
	75	test8: test8.o $(LIBRARY)
	76	- $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
	77	+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
	78
	79	test8.o: $(MUX_SRC_DIR)test8.cpp
	80	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
a2b44dd0	81
298a82c1	82	test9: test9.o $(LIBRARY)
	83	- $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
	84	+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
	85
	86	test9.o: $(TAG_SRC_DIR)test9.cpp
	87	$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
	88
a2b44dd0	89	install: $(LIBRARY)
b57b5cf5	90	- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
a2b44dd0	91	- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
b57b5cf5 JB	92	- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
	93	+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
	94	+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
	95	+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
298a82c1	96	for i in $(INCLUDE_DIR)/*.h; do \
b57b5cf5 JB	97	- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
	98	+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
	99	done
298a82c1	100	- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
	101	+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
	102	for i in $(INCLUDE_DIR)/c/*.h; do \
	103	- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
	104	+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
b57b5cf5 JB	105	done
	106
	107	# DO NOT DELETE