Commit 0e899c18 authored by Graham Inggs's avatar Graham Inggs

Completely switch from cdbs to debhelper

parent fc867f0b
......@@ -3,6 +3,7 @@ qutemol (0.4.1~cvs20081111-9) UNRELEASED; urgency=medium
* Migrate from SVN to Git
* Refresh all patches, remove trailing whitespace and fix permissions
* Drop patches included upstream
* Completely switch from cdbs to debhelper
-- Graham Inggs <ginggs@debian.org> Mon, 25 Dec 2017 11:10:09 +0000
......
......@@ -5,8 +5,7 @@ Maintainer: Debichem Team <debichem-devel@lists.alioth.debian.org>
Uploaders: Morten Kjeldgaard <mok0@ubuntu.com>,
Michael Banck <mbanck@debian.org>,
Graham Inggs <ginggs@debian.org>
Build-Depends: cdbs,
debhelper (>= 10),
Build-Depends: debhelper (>= 10),
libgif-dev (>= 5),
libglew-dev,
libpng-dev,
......
From: Morten Kjeldgaard <mok@bioxray.au.dk>
Subject: modification to source code
Description: Modifications to Makefile
Pass CXXFLAGS and LDFLAGS to enable build hardening
Define NDEBUG to quietly ignore WXDEBUG assertion failures (as happens by
default under wx2.8).
Author: Morten Kjeldgaard <mok@bioxray.au.dk>
Author: Graham Inggs <ginggs@debian.org>
Last-Update: 2017-12-25
--- a/Makefile
+++ b/Makefile
......@@ -8,12 +12,12 @@ Subject: modification to source code
INCDIRS = -Ivcg -Isrc -I.
-OPTFLAGS = -Os -Wall -g
+OPTFLAGS = -O2 -Wall -g
+CXXFLAGS ?= -O2 -Wall -g
-CXXFLAGS = $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags`
-LIBS = $(CXXFLAGS) `wx-config --libs core,base --gl-libs` -lGLEW -lGLU -lGL
+CXXFLAGS = -DPKGDATADIR='"/usr/share/qutemol/"' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags`
+LIBS = $(CXXFLAGS) $(LDFLAGS) `wx-config --libs core,base --gl-libs` -lGLEW -lGLU -lGL -lgif -lpng
+CXXFLAGS += -DPKGDATADIR='"/usr/share/qutemol/"' $(INCDIRS) `wx-config --cppflags` -DNDEBUG
+LIBS = `wx-config --libs core,base --gl-libs` -lGLEW -lGLU -lGL -lgif -lpng
OBJS = \
src/AO.o \
......@@ -32,7 +36,8 @@ Subject: modification to source code
+ rm -f $(OBJS) qutemol
qutemol: $(OBJS)
$(CXX) -o qutemol $(CFLAGS) $(OBJS) $(LIBS)
- $(CXX) -o qutemol $(CFLAGS) $(OBJS) $(LIBS)
+ $(CXX) -o qutemol $(CXXFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
+
+src/AO.o: src/AO.cpp
+src/AOgpu.o: src/AOgpu.cpp
......
#!/usr/bin/make -f
# -*- mode: makefile; mode: font-lock -*-
INCDIRS = -Ivcg -Isrc -I.
#OPTFLAGS = -Os -Wall -g
# Define NDEBUG to quietly ignore WXDEBUG assertion failures (as happens by
# default under wx2.8).
CXXFLAGS = -DPKGDATADIR='\"/usr/share/qutemol\"' $(INCDIRS) $(OPTFLAGS) `wx-config --cppflags` -DNDEBUG
CXXFLAGS += `dpkg-buildflags --get CXXFLAGS`
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk
clean::
rm -f qutemol
%:
dh $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment