[Pkg-electronics-commits] [gnucap] 08/08: pass down individual flags

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch wip
in repository gnucap.

commit c543e66b2ab78339ee841a977da7941a370b2e84
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sun Feb 7 00:45:29 2016 +0100

    pass down individual flags
---
 debian/changelog          |  3 ++-
 debian/control            |  3 +--
 debian/gnucap.install     |  2 +-
 debian/libgnucap0.install |  2 +-
 debian/rules              | 42 +++++++++++++++++++++++++++++++++++++++---
 5 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 716ae7e..dd84f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-gnucap (1:0.36~20091207-2.1) UNRELEASED; urgency=medium
+gnucap (1:0.36~20160000-1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
   * library package
   * -dev package
   * bump compat to 9
+  * default plugins package
   * WIP
 
  -- Felix Salfelder <felix at salfelder.org>  Tue, 02 Feb 2016 22:06:23 +0100
diff --git a/debian/control b/debian/control
index 6fbc598..4d84f14 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Electronics Team <pkg-electronics-devel at lists.alioth.debian.o
 Uploaders: Hamish Moffatt <hamish at debian.org>,
            أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>,
            Wesley J. Landaker <wjl at icecavern.net>
-DM-Upload-Allowed: yes
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 8), libreadline-dev
 #, hevea, texlive
@@ -21,7 +20,7 @@ Description: GNU Circuit Analysis package
  dc and transient analyses, Fourier analysis, and ac analysis
  linearized at an operating point. It is fully interactive and
  command driven. It can also be run in batch mode or as a server.
- This package contains the main executable.
+ This package contains the main executable and gnucap-modelgen.
 
 Package: gnucap-dev
 Architecture: any
diff --git a/debian/gnucap.install b/debian/gnucap.install
index ddbc334..1df36c6 100644
--- a/debian/gnucap.install
+++ b/debian/gnucap.install
@@ -1 +1 @@
-usr/bin/gnucap
+usr/bin/*
diff --git a/debian/libgnucap0.install b/debian/libgnucap0.install
index 239bcfe..dc21b89 100644
--- a/debian/libgnucap0.install
+++ b/debian/libgnucap0.install
@@ -1 +1 @@
-usr/lib/*.so
+usr/lib/lib*.so
diff --git a/debian/rules b/debian/rules
index ac40256..55a43db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,51 @@
 #!/usr/bin/make -f
 
+CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
+pkglibdir=/usr/lib/gnucap
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	./configure --prefix=/usr LDFLAGS="$(LDFLAGS) -Wl,--as-needed"
+	./configure --prefix=/usr
+
+override_dh_auto_build:
+	$(MAKE) -C lib \
+	        LDFLAGS=-shared \
+	        -Wl,--enable-new-dtags \
+	        -Wl,-rpath -Wl,${pkglibdir} \
+	        CPPFLAGS="$(CPPFLAGS)" \
+	        CXXFLAGS="$(CXXFLAGS)"
 
-#override_dh_auto_build:
-#	dh_auto_build
+	dh_auto_build --parallel -- \
+	            notyet_LDFLAGS="$(LDFLAGS)" \
+	            CPPFLAGS="$(CPPFLAGS)" \
+	            CXXFLAGS="$(CXXFLAGS)"
 #	#$(MAKE) -C man html/index.html
 
+override_dh_auto_install:
+	# dh_auto_install # not yet.
+
+	$(MAKE) install -C lib \
+	        DESTDIR=$(PWD)/debian/tmp
+
+	$(MAKE) install -C modelgen \
+	        DESTDIR=$(PWD)/debian/tmp
+
+	$(MAKE) install -C apps \
+	        INSTALL_DIR=/usr/lib/gnucap install \
+	        DESTDIR=$(PWD)/debian/tmp
+
+	$(MAKE) install -C include \
+	        DESTDIR=$(PWD)/debian/tmp
+
+	$(MAKE) install -C main \
+	        DESTDIR=$(PWD)/debian/tmp
+
 override_dh_auto_clean:
 	dh_auto_clean
 	# So as not to pollute the .diff:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gnucap.git