2004-10-06 12:17:06 +02:00
|
|
|
$NetBSD: patch-aa,v 1.1 2004/10/06 10:17:06 grant Exp $
|
2004-09-06 22:38:36 +02:00
|
|
|
|
|
|
|
|
--- Rules.make.in.orig Tue Feb 17 11:37:47 2004
|
|
|
|
|
+++ Rules.make.in
|
|
|
|
|
@@ -24,8 +24,7 @@ OBJECTS +=
|
|
|
|
|
DISTFILES +=
|
|
|
|
|
|
|
|
|
|
LIBSTATIC = $(PACKAGE).a
|
|
|
|
|
-LIBDYNAMIC = $(PACKAGE).so
|
|
|
|
|
-LIBDYNAMICV = $(PACKAGE).so.$(VERSION)
|
|
|
|
|
+LIBDYNAMICV = $(PACKAGE).la
|
|
|
|
|
|
|
|
|
|
install_LIB = $(LIBSTATIC) $(LIBDYNAMICV)
|
|
|
|
|
SCRIPTS =
|
|
|
|
|
@@ -157,19 +156,14 @@ static: $(LIBSTATIC)
|
|
|
|
|
dynamic: $(LIBDYNAMICV)
|
|
|
|
|
|
|
|
|
|
$(LIBSTATIC): $(OBJECTS)
|
|
|
|
|
- $(AR) r $@ $(OBJECTS)
|
|
|
|
|
+ :
|
|
|
|
|
|
|
|
|
|
$(LIBDYNAMICV): $(OBJECTS)
|
|
|
|
|
- $(LD) $(LDFLAGS) -shared -o $@ $(OBJECTS)
|
|
|
|
|
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -rpath $(libdir) -version-info `echo $(VERSION) | sed -e 's/0\.\([^.]*\)\.\([^.]*\)/\1\2/'`
|
|
|
|
|
|
|
|
|
|
-%.o: %.c $(CONFIG_HEADER)
|
|
|
|
|
+%.lo: %.c $(CONFIG_HEADER)
|
|
|
|
|
@echo '$(COMPILE) -c $<'; \
|
|
|
|
|
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -o $@ -c $<
|
|
|
|
|
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
|
|
|
|
|
- tr ' ' '\012' < .deps/$(*F).pp \
|
|
|
|
|
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
|
|
|
|
- >> .deps/$(*F).P; \
|
|
|
|
|
- rm .deps/$(*F).pp
|
|
|
|
|
+ $(LIBTOOL) --mode=compile $(COMPILE) -o $@ -c $<
|
|
|
|
|
|
|
|
|
|
%.o: %.cpp $(CONFIG_HEADER)
|
|
|
|
|
@echo '$(COMPILE_CXX) -c $<'; \
|
