summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Lange <kevin.lange@phpwnage.com>2011-11-30 22:12:44 -0800
committerKevin Lange <kevin.lange@phpwnage.com>2011-11-30 22:12:44 -0800
commit584fb40b7d158fb863dfbb77442486114956894b (patch)
treee6ecef21e6d002d7e8e8ef7d67e82f8a6c66e60d
parentcb850e9ab9b70f183ef9afbda9952110b3922204 (diff)
parent900194edee61b6dded593e04b435e9b7c9ca0517 (diff)
downloadnyancat-584fb40b7d158fb863dfbb77442486114956894b.tar.gz
Merge pull request #2 from apeschel/autotools
[apeschel] Made project more in line with Autotools standard.
-rw-r--r--Makefile37
-rw-r--r--src/Makefile15
-rw-r--r--src/nyancat.c (renamed from nyancat.c)0
-rwxr-xr-xsrc/nyancat.py (renamed from nyancat.py)0
-rw-r--r--src/telnetsrvlib.py (renamed from telnetsrvlib.py)0
5 files changed, 50 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8d1c3ae..58ef75b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,35 @@
-nyancat: nyancat.c
- gcc -o nyancat nyancat.c
+package = nyancat
+version = 0.1
+tarname = $(package)
+distdir = $(tarname)-$(version)
+
+all clean check parser:
+ cd src && $(MAKE) $@
+
+dist: $(distdir).tar.gz
+
+$(distdir).tar.gz: $(distdir)
+ tar chof - $(distdir) | gzip -9 -c > $@
+ rm -rf $(distdir)
+
+$(distdir): FORCE
+ mkdir -p $(distdir)/src
+ cp Makefile $(distdir)
+ cp src/Makefile $(distdir)/src
+ cp src/nyancat.c $(distdir)/src
+ cp src/nyancat.py $(distdir)/src
+ cp src/telnetsrvlib.py $(distdir)/src
+
+FORCE:
+ -rm $(distdir).tar.gz >/dev/null 2>&1
+ -rm -rf $(distdir) >/dev/null 2>&1
+
+distcheck: $(distdir).tar.gz
+ gzip -cd $(distdir).tar.gz | tar xvf -
+ cd $(distdir) && $(MAKE) all
+ cd $(distdir) && $(MAKE) check
+ cd $(distdir) && $(MAKE) clean
+ rm -rf $(distdir)
+ @echo "*** Package $(distdir).tar.gz is ready for distribution."
+
+.PHONY: FORCE all clean check dist distcheck
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 0000000..1701c11
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,15 @@
+OBJECTS = nyancat.o
+
+all: nyancat
+
+nyancat: $(OBJECTS)
+ $(CC) $(LFLAGS) $(OBJECTS) -o $@
+
+clean:
+ -rm -f $(OBJECTS) nyancat
+
+check: all
+ # Unit tests go here. None currently.
+ @echo "*** ALL TESTS PASSED ***"
+
+.PHONY: all clean check
diff --git a/nyancat.c b/src/nyancat.c
index 0037a64..0037a64 100644
--- a/nyancat.c
+++ b/src/nyancat.c
diff --git a/nyancat.py b/src/nyancat.py
index 039581c..039581c 100755
--- a/nyancat.py
+++ b/src/nyancat.py
diff --git a/telnetsrvlib.py b/src/telnetsrvlib.py
index 14b9b2f..14b9b2f 100644
--- a/telnetsrvlib.py
+++ b/src/telnetsrvlib.py
Imported Upstream version 0+git20150208.f2053b3upstream/0+git20150208.f2053b3Jonathan McCrohan32-333/+483 2014-12-28Release 0+git20141218.b46a22c-1debian/0+git20141218.b46a22c-1Jonathan McCrohan1-2/+2 2014-12-28Updated AU DVB-T files; Thanks Brian Burch! (Closes LP: #1393280)Jonathan McCrohan1-0/+1 2014-12-28New Upstream Snapshot (commit b46a22c)Jonathan McCrohan1-0/+6 2014-12-28Imported Upstream version 0+git20141218.b46a22cupstream/0+git20141218.b46a22cJonathan McCrohan535-639/+317 2014-10-20Release 0+git20141009.d26b627-1debian/0+git20141009.d26b627-1Jonathan McCrohan1-2/+2 2014-10-20Fix up packaging to account for move to DVBv5Jonathan McCrohan2-2/+6 2014-10-20delete d/dtv-scan-files.install; Upstream now supplies a MakefileJonathan McCrohan2-4/+1 2014-10-15d/control: update Standards Version to 3.9.6Jonathan McCrohan2-1/+3 2014-10-15d/control: add Build-Depends on dvb-toolsJonathan McCrohan2-1/+2 2014-10-15New Upstream Snapshot (commit d26b627)Jonathan McCrohan1-0/+10 2014-10-15Imported Upstream version 0+git20141009.d26b627upstream/0+git20141009.d26b627Jonathan McCrohan2010-11120/+159271 2014-07-23Release 0+git20140611.14bd6c7-1debian/0+git20140611.14bd6c7-1Jonathan McCrohan1-2/+2 2014-07-23New Upstream Snapshot (commit 14bd6c7)Jonathan McCrohan1-2/+3 2014-07-23Imported Upstream version 0+git20140611.14bd6c7upstream/0+git20140611.14bd6c7Jonathan McCrohan7-11/+60 2014-05-13New Upstream Snapshot (commit 1246b27)Jonathan McCrohan1-0/+6 2014-05-13Imported Upstream version 0+git20140512.1246b27upstream/0+git20140512.1246b27Jonathan McCrohan391-301/+3983 2014-04-05Release 0+git20140326.cfc2975-1debian/0+git20140326.cfc2975-1Jonathan McCrohan1-2/+2 2014-04-05d/control: update Homepage (upstream has moved from Gitweb to cgit)Jonathan McCrohan2-1/+2 2014-04-05New Upstream Snapshot (commit cfc2975)Jonathan McCrohan1-0/+6 2014-04-05Imported Upstream version 0+git20140326.cfc2975upstream/0+git20140326.cfc2975Jonathan McCrohan118-656/+877 2014-01-16Release 0+git20140107.1850cf8-1debian/0+git20140107.1850cf8-1Jonathan McCrohan1-2/+2 2014-01-16Update Standards Version to 3.9.5Jonathan McCrohan2-1/+9 No changes required