summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-04-30 15:30:29 +0000
committerRoy Marples <roy@marples.name>2009-04-30 15:30:29 +0000
commit260d960e47803ed857cbab7f42ce73b61e7f61ef (patch)
tree5e4bca960dd28fa2f2238f4e87bf37139f00436c
parent371233ce2057b1ce48cdcbd4731b4665a47c45a3 (diff)
downloaddhcpcd-260d960e47803ed857cbab7f42ce73b61e7f61ef.tar.xz
Go back to using git
-rw-r--r--.gitignore9
-rw-r--r--mk/cc.mk2
-rw-r--r--mk/dist.mk6
3 files changed, 12 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..5a7e248c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.depend
+*.o
+*.bz2
+dhcpcd
+dhcpcd.conf.5
+dhcpcd.core
+dhcpcd.8
+dhcpcd-run-hooks
+dhcpcd-run-hooks.8
diff --git a/mk/cc.mk b/mk/cc.mk
index 71cb4094..3af82a09 100644
--- a/mk/cc.mk
+++ b/mk/cc.mk
@@ -19,7 +19,7 @@ _CCFLAGS= -Wall -Wextra -Wimplicit -Wshadow -Wformat=2 \
-Winline -Wwrite-strings -Wcast-align -Wcast-qual \
-Wpointer-arith \
-Wdeclaration-after-statement -Wsequence-point
-_CC_FLAGS_SH= if ! test -d .svn; then echo ""; else for f in ${_CCFLAGS}; do \
+_CC_FLAGS_SH= if ! test -d .git; then echo ""; else for f in ${_CCFLAGS}; do \
if echo "int main(void) { return 0;} " | \
${CC} $$f -S -xc -o /dev/null - ; \
then printf "%s" "$$f "; fi \
diff --git a/mk/dist.mk b/mk/dist.mk
index 0ed6752d..7b844daf 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -1,5 +1,5 @@
# rules to make a distribution tarball from a svn repo
-# Copyright 2008 Roy Marples <roy@marples.name>
+# Copyright 2008-2009 Roy Marples <roy@marples.name>
GITREF?= HEAD
DISTPREFIX?= ${PROG}-${VERSION}
@@ -18,9 +18,7 @@ SNAPDIR= ${DISTPREFIX}-${SNAP}
SNAPFILE= ${SNAPDIR}.tar.bz2
dist:
- svn export . ${DISTPREFIX}
- tar cjpf ${DISTFILE} ${DISTPREFIX}
- rm -rf ${DISTPREFIX}
+ git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
snapshot:
mkdir /tmp/${SNAPDIR}