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

--- libebml/make/linux/Makefile.orig	2003-07-17 11:47:07.000000000 +0200
+++ libebml/make/linux/Makefile	2003-09-02 15:18:20.727607600 +0200
@@ -25,6 +25,7 @@
 INSTALL_OPTS = -m 644
 INSTALL_OPTS_LIB = -m 644
 INSTALL_DIR_OPTS = -m 755
+LIBTOOL = libtool
 
 # Options
 EXTENSION=.cpp
@@ -45,7 +46,7 @@
 LIBS=
 
 # Names
-LIBRARY=libebml.a
+LIBRARY=libebml.la
 
 # source-files
 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
@@ -56,8 +57,8 @@
 # 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}
 
@@ -66,14 +67,12 @@
 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) -rpath $(libdir)
+
 
 clean:
 	rm -f $(objects)
@@ -86,15 +85,15 @@
 	$(DEPEND) $(DEPENDFLAGS) $(sources)
 
 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
4616b5fc	1	--- libebml/make/linux/Makefile.orig 2003-07-17 11:47:07.000000000 +0200
4616b5fc	2	+++ libebml/make/linux/Makefile 2003-09-02 15:18:20.727607600 +0200
1e89c424	3	@@ -25,6 +25,7 @@
0928b7ec	4	INSTALL_OPTS = -m 644
	5	INSTALL_OPTS_LIB = -m 644
	6	INSTALL_DIR_OPTS = -m 755
	7	+LIBTOOL = libtool
	8
	9	# Options
	10	EXTENSION=.cpp
4616b5fc	11	@@ -45,7 +46,7 @@
0928b7ec	12	LIBS=
	13
	14	# Names
	15	-LIBRARY=libebml.a
	16	+LIBRARY=libebml.la
	17
	18	# source-files
	19	sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
4616b5fc	20	@@ -56,8 +57,8 @@
0928b7ec	21	# files holding dependency information; replace .cxx extension with .dep
	22	dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
	23
	24	-# object files; replace .cxx extension with .o
	25	-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
	26	+# object files; replace .cxx extension with .lo
	27	+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
	28
	29	DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
	30
4616b5fc	31	@@ -66,14 +67,12 @@
0928b7ec	32	lib library: $(LIBRARY)
	33
	34	# Build rules
	35	-%.o: %$(EXTENSION)
	36	- $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
	37	+%.lo: %$(EXTENSION)
	38	+ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
	39
	40	$(LIBRARY): $(objects)
	41	- $(AR) $@ $(objects)
	42	- $(RANLIB) $@
	43	-# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
	44	-# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
	45	+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
	46	+
	47
	48	clean:
	49	rm -f $(objects)
4616b5fc	50	@@ -86,15 +85,15 @@
0928b7ec	51	$(DEPEND) $(DEPENDFLAGS) $(sources)
	52
	53	install: $(LIBRARY)
	54	- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
	55	- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
	56	- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
	57	+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
	58	+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
	59	+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
	60	for i in $(INCLUDE_DIR)/*.h; do \
	61	- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
	62	+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
	63	done
	64	- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
	65	+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
	66	for i in $(INCLUDE_DIR)/c/*.h; do \
	67	- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
	68	+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
	69	done
	70
	71	# DO NOT DELETE