[dm-devel] dmraid lib/Makefile.in ./make.tmpl.in
zkabelac at sourceware.org
zkabelac at sourceware.org
Sat May 29 21:34:42 UTC 2010
CVSROOT: /cvs/dm
Module name: dmraid
Changes by: zkabelac at sourceware.org 2010-05-29 21:34:42
Modified files:
lib : Makefile.in
. : make.tmpl.in
Log message:
Remove global %.so target
Add target for plugin.so
Add target for libdmraid.so
Hardcoded major version for libdmraid.so -> libdmraid.so.1
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/lib/Makefile.in.diff?cvsroot=dm&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/dmraid/make.tmpl.in.diff?cvsroot=dm&r1=1.9&r2=1.10
--- dmraid/lib/Makefile.in 2010/05/28 12:35:01 1.12
+++ dmraid/lib/Makefile.in 2010/05/29 21:34:41 1.13
@@ -73,10 +73,16 @@
all: $(TARGETS)
+# FIXME Use major version for -soname
+$(LIB_SHARED): $(OBJECTS) $(top_srcdir)/lib/.export.sym
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS) \
+ -shared -Wl,-soname,$(notdir $@).1 \
+ -Wl,--version-script,$(top_srcdir)/lib/.export.sym \
+ -ldevmapper-event
+
$(LIB_EVENTS_SHARED): $(OBJECTS2)
- $(CC) -o $@ $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
- -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
- $(LIB_SHARED) -ldevmapper-event -lpthread
+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
+ -shared -Wl,-soname,$(notdir $@) -ldevmapper-event -lpthread
.PHONY: $(addprefix install_,$(TARGETS)) $(addprefix remove_,$(TARGETS))
--- dmraid/make.tmpl.in 2010/05/28 12:31:39 1.9
+++ dmraid/make.tmpl.in 2010/05/29 21:34:41 1.10
@@ -130,8 +130,8 @@
$(TARGETS): $(OBJECTS)
-%.o: %.c
- $(CC) -c $(INCLUDES) $(CFLAGS) $< -o $@
+%.o: %.c $(top_builddir)/include/config.h
+ $(CC) -o $@ -c $(INCLUDES) $(CFLAGS) -include $(top_builddir)/include/config.h $<
%.d: %.c
$(MKDIR_P) $(dir $@); \
@@ -142,12 +142,6 @@
sed -i "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d $$FILE.pot: $$DEPS /g" $@; \
[ -s $@ ] || $(RM) $@
-%.so: $(OBJECTS) $(top_srcdir)/lib/.export.sym
-
-%.so: $(OBJECTS)
- $(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
- -Wl,--version-script,$(top_srcdir)/lib/.export.sym $(OBJECTS) -o $@ -ldevmapper-event
-
$(LIB_STATIC): $(OBJECTS)
$(RM) $@
$(AR) r $@ $(OBJECTS)
More information about the dm-devel
mailing list