[med-svn] r11689 - trunk/packages/genometools/trunk/debian/patches

[Sascha Steinbiss]

Author: sascha-guest
Date: 2012-07-10 12:53:15 +0000 (Tue, 10 Jul 2012)
New Revision: 11689

Modified:
   trunk/packages/genometools/trunk/debian/patches/adding_soname
   trunk/packages/genometools/trunk/debian/patches/libbam-fix
Log:
clean up some lintian issues


Modified: trunk/packages/genometools/trunk/debian/patches/adding_soname
===================================================================
--- trunk/packages/genometools/trunk/debian/patches/adding_soname	2012-07-10 12:35:48 UTC (rev 11688)
+++ trunk/packages/genometools/trunk/debian/patches/adding_soname	2012-07-10 12:53:15 UTC (rev 11689)
@@ -23,7 +23,7 @@
  	@test -d $(@D) || mkdir -p $(@D)
 -	@$(CC) $(EXP_LDFLAGS) $(GT_LDFLAGS) $(SHARED) $(LIBGENOMETOOLS_OBJ) \
 -	-o $@ $(GTSHAREDLIB_LIBDEP)
-+	@$(CC) $(EXP_LDFLAGS) $(GT_LDFLAGS) $(SHARED) -Wl,-soname,$(notdir $@) $(LIBGENOMETOOLS_OBJ) \
++	@$(CC) $(EXP_LDFLAGS) $(GT_LDFLAGS) $(SHARED) -Wl,-soname,$(notdir $@)$(SONAME_VERSION) $(LIBGENOMETOOLS_OBJ) \
 +	-o $@$(SONAME_VERSION) $(GTSHAREDLIB_LIBDEP)
  
  lib/libtecla.a: $(LIBTECLA_OBJ)

Modified: trunk/packages/genometools/trunk/debian/patches/libbam-fix
===================================================================
--- trunk/packages/genometools/trunk/debian/patches/libbam-fix	2012-07-10 12:35:48 UTC (rev 11688)
+++ trunk/packages/genometools/trunk/debian/patches/libbam-fix	2012-07-10 12:53:15 UTC (rev 11689)
@@ -20,7 +20,7 @@
  lib/libgenometools.a: obj/gt_config.h  $(LIBGENOMETOOLS_OBJ)
  	@echo "[link $(@F)]"
  	@test -d $(@D) || mkdir -p $(@D)
-@@ -528,19 +532,13 @@
+@@ -528,19 +532,14 @@
  	@$(RANLIB) $@
  endif
  
@@ -36,13 +36,15 @@
 +                                          $(ADDITIONAL_STATIC_DEPS)
  	@echo "[link $(@F)]"
  	@test -d $(@D) || mkdir -p $(@D)
- 	@$(CC) $(EXP_LDFLAGS) $(GT_LDFLAGS) $(SHARED) -Wl,-soname,$(notdir $@) $(LIBGENOMETOOLS_OBJ) \
+-	@$(CC) $(EXP_LDFLAGS) $(GT_LDFLAGS) $(SHARED) -Wl,-soname,$(notdir $@)$(SONAME_VERSION) $(LIBGENOMETOOLS_OBJ) \
 -	-o $@$(SONAME_VERSION) $(GTSHAREDLIB_LIBDEP)
-+	-o $@$(SONAME_VERSION) $(GTSHAREDLIB_LIBDEP) $(ADDITIONAL_STATIC_DEPS)
++	@$(CC) $(EXP_LDFLAGS) $(GT_LDFLAGS) $(SHARED) \
++    -Wl,-soname,$(notdir $@)$(SONAME_VERSION) $(LIBGENOMETOOLS_OBJ) \
++    -o $@$(SONAME_VERSION) $(GTSHAREDLIB_LIBDEP) $(ADDITIONAL_STATIC_DEPS)
  
  lib/libtecla.a: $(LIBTECLA_OBJ)
  	@echo "[link $(@F)]"
-@@ -568,48 +566,62 @@
+@@ -568,48 +567,62 @@
  
  $(eval $(call PROGRAM_template, bin/skproto, $(SKPROTO_OBJ) \
                                               lib/libgenometools.a\
@@ -109,3 +111,12 @@
  
  bin/lua: $(LUAMAIN_OBJ)
  	@echo "[link $(@F)]"
+@@ -709,7 +722,7 @@
+ 	@echo "[compile $$(@F)]"
+ 	@test -d $$(@D) || mkdir -p $$(@D)
+ 	@$$(CC) -c $$< -o $$@ $$(EXP_CPPFLAGS) $$(GT_CPPFLAGS) $$(EXP_CFLAGS) \
+-	  $$(GT_CFLAGS) $(3) 
++	  $$(GT_CFLAGS) $(3)
+ 	@$$(CC) -c $$< -o $$(@:.o=.d) $$(EXP_CPPFLAGS) $$(GT_CPPFLAGS) \
+         $(3) -MM -MP -MT $$@
+ endef