dazz_db: Add CFLAGS to makefile patch

outpaddling · May 1, 2018 · 55e7234 · 55e7234
1 parent 274a5a4
commit 55e7234
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/dazz_db/distinfo b/dazz_db/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525210394
+TIMESTAMP = 1525211924
 SHA256 (PacificBiosciences-DAZZ_DB-V1.0-14-g7104852_GH0.tar.gz) = fae50558322d81bdb8b7331fa0a104acefcf429aa2e33ed6c4619b59f2d3d059
 SIZE (PacificBiosciences-DAZZ_DB-V1.0-14-g7104852_GH0.tar.gz) = 82038
diff --git a/dazz_db/files/patch-Makefile b/dazz_db/files/patch-Makefile
@@ -1,22 +1,38 @@
 --- Makefile.orig	2018-01-15 05:13:57 UTC
 +++ Makefile
-@@ -1,6 +1,12 @@
+@@ -1,80 +1,108 @@
 -DEST_DIR = ~/bin
 +DESTDIR ?=
 +PREFIX	?= ~/
 
 -CFLAGS = -O3 -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
 +CC	?= gcc
 +CFLAGS	+= -Wall -Wextra -Wno-unused-result -fno-strict-aliasing
-+
+
+-ALL = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow DBstats DBrm DBmv \
+-      simulator fasta2DAM DAM2fasta DBdump rangen arrow2DB DB2arrow DBwipe DBtrim
 +MKDIR		?= mkdir
 +INSTALL		?= install
 +STRIP_CMD	?= strip
-
- ALL = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow DBstats DBrm DBmv \
-       simulator fasta2DAM DAM2fasta DBdump rangen arrow2DB DB2arrow DBwipe DBtrim
-@@ -8,64 +14,64 @@ ALL = fasta2DB DB2fasta quiva2DB DB2quiv
- all: $(ALL)
++AR		?= ar
+
+-all: $(ALL)
++BINS = fasta2DB DB2fasta quiva2DB DB2quiva DBsplit DBdust Catrack DBshow \
++	DBstats DBrm DBmv simulator fasta2DAM DAM2fasta DBdump rangen \
++	arrow2DB DB2arrow DBwipe DBtrim
++LIB 	= libdazz_db.a
++OBJS	= DB.o QV.o
++
++all: $(BINS) $(LIB)
++
++$(LIB): $(OBJS)
++	$(AR) rs $(LIB) $(OBJS)
++
++DB.o: DB.c
++	$(CC) -c $(CFLAGS) DB.c
++
++QV.o: QV.c
++	$(CC) -c $(CFLAGS) QV.c
 
  fasta2DB: fasta2DB.c DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o fasta2DB fasta2DB.c DB.c QV.c -lm
@@ -96,25 +112,28 @@
 
  DBwipe: DBwipe.c DB.c DB.h QV.c QV.h
 -	gcc $(CFLAGS) -o DBwipe DBwipe.c DB.c QV.c -lm
+-
 +	$(CC) $(CFLAGS) -o DBwipe DBwipe.c DB.c QV.c -lm
 
-
  clean:
-@@ -73,8 +79,16 @@ clean:
+-	rm -f $(ALL)
++	rm -f $(BINS)
  	rm -fr *.dSYM
  	rm -f dazz.db.tar.gz
 
 +install-strip: install
-+	for f in $(ALL); do \
++	for f in $(BINS); do \
 +		$(STRIP_CMD) $(DESTDIR)$(PREFIX)/bin/$$f; \
 +	done
 +
  install:
 -	cp $(ALL) $(DEST_DIR)
 +	$(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
-+	$(INSTALL) -c $(ALL) $(DESTDIR)$(PREFIX)/bin
++	$(INSTALL) -c $(BINS) $(DESTDIR)$(PREFIX)/bin
 +	$(MKDIR) -p $(DESTDIR)$(PREFIX)/include/dazz_db
 +	$(INSTALL) -c *.h $(DESTDIR)$(PREFIX)/include/dazz_db
++	$(MKDIR) -p $(DESTDIR)$(PREFIX)/lib
++	$(INSTALL) -c $(LIB) $(DESTDIR)$(PREFIX)/lib
 
  package:
  	make clean
diff --git a/dazz_db/pkg-plist b/dazz_db/pkg-plist
@@ -20,3 +20,4 @@ bin/rangen
 bin/simulator
 include/dazz_db/DB.h
 include/dazz_db/QV.h
+lib/libdazz_db.a