[med-svn] r1729 - in trunk/packages/plink/trunk: . debian debian/patches

[smoe-guest at alioth.debian.org]

Author: smoe-guest
Date: 2008-04-09 16:29:01 +0000 (Wed, 09 Apr 2008)
New Revision: 1729

Removed:
   trunk/packages/plink/trunk/Makefile
Modified:
   trunk/packages/plink/trunk/debian/patches/series
   trunk/packages/plink/trunk/debian/rules
Log:
Request for comments.


Deleted: trunk/packages/plink/trunk/Makefile
===================================================================
--- trunk/packages/plink/trunk/Makefile	2008-04-09 13:48:52 UTC (rev 1728)
+++ trunk/packages/plink/trunk/Makefile	2008-04-09 16:29:01 UTC (rev 1729)
@@ -1,120 +0,0 @@
-# -----------------------------------------------------------------#   Makefile for PLINK 
-#   
-#   Supported platforms
-#       Unix / Linux                LINUX
-#       Windows                     WIN
-#       Mac                         MAC
-#       Solaris                     SOLARIS
-#  
-#   Compilation options
-#       R plugins                   WITH_R_PLUGINS
-#       Web-based version check     WITH_WEBCHECK
-#       Ensure 32-bit binary        FORCE_32BIT 
-#
-# ---------------------------------------------------------------------
-
-# Set this variable to either UNIX, MAC or WIN
-SYS = UNIX
-
-# Leave blank after "=" to disable; put "= 1" to enable
-WITH_R_PLUGINS = 
-WITH_WEBCHECK = 1
-FORCE_32BIT = 
-
-# Put C++ compiler here; Windows has it's own specific version
-CXX_UNIX = g++-3.3
-CXX_WIN = c:\bin\mingw\bin\mingw32-g++.exe
-
-# Any other compiler flags here ( -Wall, -g, etc)
-CXXFLAGS = 
-
-# --------------------------------------------------------------------
-# Do not edit below this line
-# --------------------------------------------------------------------
-
-CXXFLAGS += -O3 -I.
-OUTPUT = plink
-
-# Some system specific flags
-
-ifeq ($(SYS),WIN)
- CXXFLAGS += -DWIN -static
- CXX = $(CXX_WIN)
-endif
-
-ifeq ($(SYS),UNIX)
- CXXFLAGS += -DUNIX
- CXX = $(CXX_UNIX)
-endif
-
-ifeq ($(SYS),MAC)
- CXXFLAGS += -DUNIX -Dfopen64=fopen
- CXX = $(CXX_UNIX)
-endif
-
-ifeq ($(SYS),SOLARIS)
- CXX = $(CXX_UNIX)
-endif
-
-ifdef FORCE_32BIT
- CXXFLAGS += -m32
-endif
-
-# Flags for web-based version check
-
-ifdef WITH_WEBCHECK
-ifeq ($(SYS),WIN)
- LIB += -lwsock32
-endif
-else
- CXXFLAGS += -DSKIP
-endif
-
-
-
-SRC = plink.cpp options.cpp input.cpp binput.cpp tinput.cpp genome.cpp	\
-helper.cpp filters.cpp locus.cpp multi.cpp crandom.cpp cluster.cpp	\
-mds.cpp output.cpp informative.cpp assoc.cpp epi.cpp prephap.cpp	\
-phase.cpp trio.cpp tdt.cpp sharing.cpp genepi.cpp sets.cpp perm.cpp	\
-mh.cpp genedrop.cpp gxe.cpp merge.cpp hotel.cpp multiple.cpp		\
-haploCC.cpp haploTDT.cpp poo.cpp webcheck.cpp qfam.cpp linear.cpp	\
-bmerge.cpp parse.cpp mishap.cpp legacy.cpp homozyg.cpp segment.cpp	\
-model.cpp logistic.cpp glm.cpp dcdflib.cpp rarer.cpp dfam.cpp		\
-fisher.cpp linput.cpp sockets.cpp lookup.cpp proxy.cpp pdriver.cpp	\
-haploQTL.cpp haplohelper.cpp haplowindow.cpp genogroup.cpp		\
-nonfounderphasing.cpp clumpld.cpp genoerr.cpp em.cpp impute.cpp		\
-metaem.cpp profile.cpp nlist.cpp whap.cpp simul.cpp gvar.cpp cnv.cpp
-
-HDR = plink.h options.h helper.h crandom.h sets.h phase.h perm.h	\
-model.h linear.h logistic.h dcdflib.h ipmpar.h cdflib.h fisher.h	\
-sockets.h haplowindow.h genogroup.h clumpld.h nlist.h whap.h gvar.h
-
-ifdef WITH_R_PLUGINS
-CXXFLAGS += -DWITH_R_PLUGINS
-HDR += sisocks.h Rsrv.h Rconnection.h config.h
-SRC += r.cpp Rconnection.cpp
-LIB += -ldl -lcrypt
-endif
-
-OBJ = $(SRC:.cpp=.o)
-
-all : $(OUTPUT) 
-
-$(OUTPUT) :
-	$(CXX) $(CXXFLAGS) -o $(OUTPUT) $(OBJ) $(LIB) 
-
-$(OBJ) : $(HDR)
-
-.cpp.o : 
-	$(CXX) $(CXXFLAGS) -c $*.cpp
-.SUFFIXES : .cpp .c .o $(SUFFIXES)
-
-$(OUTPUT) : $(OBJ)
-
-FORCE:
-
-clean:
-	rm -f *.o *~
-
-distclean: clean
-	rm -f plink

Modified: trunk/packages/plink/trunk/debian/patches/series
===================================================================
--- trunk/packages/plink/trunk/debian/patches/series	2008-04-09 13:48:52 UTC (rev 1728)
+++ trunk/packages/plink/trunk/debian/patches/series	2008-04-09 16:29:01 UTC (rev 1729)
@@ -1 +1,2 @@
 gcc43.patch
+Makefile.patch

Modified: trunk/packages/plink/trunk/debian/rules
===================================================================
--- trunk/packages/plink/trunk/debian/rules	2008-04-09 13:48:52 UTC (rev 1728)
+++ trunk/packages/plink/trunk/debian/rules	2008-04-09 16:29:01 UTC (rev 1729)
@@ -1,8 +1,41 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/quilt/quilt.make
 
+build: patch build-stamp
+build-stamp:
+	$(MAKE)
+	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	dh_clean build-stamp install-stamp
+
+install: install-stamp
+install-stamp:
+	# nothing to do, the single binary is taken directly
+	touch $@
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+	dh_install
+	dh_installman
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-indep:
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+
+.PHONY: build clean binary-indep binary-arch binary