From 48765ff1e8f368d404ce1cba28c32b8eb72bd560 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sat, 25 May 2013 17:13:26 +0200 Subject: [PATCH] grumble, pkg/*: get rid of makefiles. --- Makefile | 95 --------------------------------- pkg/ban/Makefile | 7 --- pkg/cryptstate/Makefile | 7 --- pkg/cryptstate/testgen/Makefile | 9 ---- pkg/freezer/Makefile | 13 ----- pkg/htmlfilter/Makefile | 7 --- pkg/logtarget/Makefile | 7 --- pkg/mumbleproto/Makefile | 9 ---- pkg/serverconf/Makefile | 7 --- pkg/sessionpool/Makefile | 7 --- 10 files changed, 168 deletions(-) delete mode 100644 Makefile delete mode 100644 pkg/ban/Makefile delete mode 100644 pkg/cryptstate/Makefile delete mode 100644 pkg/cryptstate/testgen/Makefile delete mode 100644 pkg/freezer/Makefile delete mode 100644 pkg/htmlfilter/Makefile delete mode 100644 pkg/logtarget/Makefile delete mode 100644 pkg/mumbleproto/Makefile delete mode 100644 pkg/serverconf/Makefile delete mode 100644 pkg/sessionpool/Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 25a1738..0000000 --- a/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (c) 2010 The Grumble Authors -# The use of this source code is goverened by a BSD-style -# license that can be found in the LICENSE-file. - -include $(GOROOT)/src/Make.inc - -TARG = grumble -ifeq ($(GOOS),windows) -TARG:=$(TARG).exe -endif - -PACKAGES = \ - pkg/packetdatastream \ - pkg/cryptstate \ - pkg/mumbleproto \ - pkg/blobstore \ - pkg/serverconf \ - pkg/sessionpool \ - pkg/ban \ - pkg/htmlfilter \ - pkg/freezer \ - pkg/logtarget - -GCFLAGS = \ - -Ipkg/cryptstate/_obj \ - -Ipkg/packetdatastream/_obj \ - -Ipkg/mumbleproto/_obj \ - -Ipkg/blobstore/_obj \ - -Ipkg/serverconf/_obj \ - -Ipkg/sessionpool/_obj \ - -Ipkg/ban/_obj \ - -Ipkg/htmlfilter/_obj \ - -Ipkg/freezer/_obj \ - -Ipkg/logtarget/_obj - -LDFLAGS = \ - -Lpkg/cryptstate/_obj \ - -Lpkg/packetdatastream/_obj \ - -Lpkg/mumbleproto/_obj \ - -Lpkg/blobstore/_obj \ - -Lpkg/serverconf/_obj \ - -Lpkg/sessionpool/_obj \ - -Lpkg/ban/_obj \ - -Lpkg/htmlfilter/_obj \ - -Lpkg/freezer/_obj \ - -Lpkg/logtarget/_obj - -GOFILES = \ - grumble.go \ - message.go \ - server.go \ - client.go \ - channel.go \ - acl.go \ - group.go \ - user.go \ - voicetarget.go \ - freeze.go \ - gencert.go \ - register.go \ - ssh.go \ - args.go \ - -ifeq ($(SQLITE),1) - GOFILES += murmurdb.go - PACKAGES += pkg/sqlite - GCFLAGS += -Ipkg/sqlite/_obj - LDFLAGS += -Lpkg/sqlite/_obj -else - GOFILES += murmurdb_null.go -endif - -ifeq ($(GOOS),windows) - GOFILES += signal_windows.go -else - GOFILES += signal_unix.go -endif - -.PHONY: grumble -grumble: pkg - $(GC) $(GCFLAGS) -o $(TARG).$(O) $(GOFILES) - $(LD) $(LDFLAGS) -o $(TARG) $(TARG).$(O) - -.PHONY: pkg -pkg: - for dir in $(PACKAGES); do $(MAKE) -C $$dir; done - -.PHONY: pkgclean -pkgclean: - for dir in $(PACKAGES); do $(MAKE) -C $$dir clean; done - -.PHONY: clean -clean: pkgclean - rm -f grumble - rm -f *.$(O) diff --git a/pkg/ban/Makefile b/pkg/ban/Makefile deleted file mode 100644 index a6902c1..0000000 --- a/pkg/ban/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/ban -GOFILES = \ - ban.go - -include $(GOROOT)/src/Make.pkg diff --git a/pkg/cryptstate/Makefile b/pkg/cryptstate/Makefile deleted file mode 100644 index 97b894b..0000000 --- a/pkg/cryptstate/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/cryptstate -GOFILES = \ - cryptstate.go - -include $(GOROOT)/src/Make.pkg diff --git a/pkg/cryptstate/testgen/Makefile b/pkg/cryptstate/testgen/Makefile deleted file mode 100644 index fede5ec..0000000 --- a/pkg/cryptstate/testgen/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -.PHONY: default -default: - g++ test.cpp CryptState.cpp -o test -lcrypto - g++ test2.cpp CryptState.cpp -o test2 -lcrypto - g++ test3.cpp CryptState.cpp -o test3 -lcrypto - -.PHONY: clean -clean: - rm -f test test2 test3 diff --git a/pkg/freezer/Makefile b/pkg/freezer/Makefile deleted file mode 100644 index e2ccce1..0000000 --- a/pkg/freezer/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/freezer -GOFILES = \ - writer.go \ - walker.go \ - types.go \ - types.pb.go \ - error.go - -include $(GOROOT)/src/Make.pkg -include $(GOROOT)/src/pkg/goprotobuf.googlecode.com/hg/Make.protobuf - diff --git a/pkg/htmlfilter/Makefile b/pkg/htmlfilter/Makefile deleted file mode 100644 index 62d6612..0000000 --- a/pkg/htmlfilter/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/htmlfilter -GOFILES = \ - htmlfilter.go - -include $(GOROOT)/src/Make.pkg diff --git a/pkg/logtarget/Makefile b/pkg/logtarget/Makefile deleted file mode 100644 index 6f3ce8b..0000000 --- a/pkg/logtarget/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/logtarget -GOFILES = \ - logtarget.go - -include $(GOROOT)/src/Make.pkg diff --git a/pkg/mumbleproto/Makefile b/pkg/mumbleproto/Makefile deleted file mode 100644 index ef8353b..0000000 --- a/pkg/mumbleproto/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/mumbleproto -GOFILES=\ - Mumble.pb.go \ - types.go - -include $(GOROOT)/src/Make.pkg -include $(GOROOT)/src/pkg/goprotobuf.googlecode.com/hg/Make.protobuf diff --git a/pkg/serverconf/Makefile b/pkg/serverconf/Makefile deleted file mode 100644 index ef47451..0000000 --- a/pkg/serverconf/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/serverconf -GOFILES = \ - config.go - -include $(GOROOT)/src/Make.pkg diff --git a/pkg/sessionpool/Makefile b/pkg/sessionpool/Makefile deleted file mode 100644 index 05d0ad6..0000000 --- a/pkg/sessionpool/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include $(GOROOT)/src/Make.inc - -TARG = grumble/sessionpool -GOFILES = \ - sessionpool.go - -include $(GOROOT)/src/Make.pkg