move wig2png source and build system into a wig2png subdirectory.

Also take the js minification and twiki stuff out of its Makefile.in and put it in a Makefile.deploy file, still in the root.
GMOD · Mar 7, 2012 · b4c1e7e · b4c1e7e
1 parent d4b458c
commit b4c1e7e
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 194 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,6 @@ bin/wig2png
 *TODO.txt
 Makefile
 /sample_data/json
-./config.log
-./config.status
+wig2png/config.log
+wig2png/config.status
+wig2png/src/config.h
diff --git a/Makefile.in → Makefile.deploy b/Makefile.in → Makefile.deploy
@@ -1,33 +1,14 @@
-BINDIR = bin
-SRCDIR = src
 JSDIR = js
 JARDIR = jar
-
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@ -include $(SRCDIR)/config.h
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-CXXARGS = $(CXXFLAGS) $(LDFLAGS) $(LIBS)
-
-WIG2PNG_TARGET = $(BINDIR)/wig2png
-WIG2PNG_SRCFILES = $(SRCDIR)/wig2png.cc $(SRCDIR)/opts_list.cc
-
 JSMIN_TARGET = jbrowse.js
 JS_SRCFILES = $(wildcard $(JSDIR)/*.js)
-
 TWIKI_PLUGIN_MAKEFILE = twiki/JBrowsePlugin/Makefile.jbrowse
 
-all: $(WIG2PNG_TARGET)
+all: minify-js
 
-clean:
-	rm $(WIG2PNG_TARGET)
-
-jbrowse: all
+jbrowse:
 	$(MAKE) -f $(TWIKI_PLUGIN_MAKEFILE) all
 
-$(WIG2PNG_TARGET): $(WIG2PNG_SRCFILES)
-	$(CXX) $(CXXARGS) -o $@ $(WIG2PNG_SRCFILES)
-
 minify-js: $(JSMIN_TARGET)
 
 $(JSMIN_TARGET): $(JS_SRCFILES)
@@ -38,5 +19,3 @@ $(JSMIN_TARGET): $(JS_SRCFILES)
 	fi
 
 .PHONY: all clean jbrowse minify-js
-
-.SECONDARY:
diff --git a/src/config.h b/src/config.h
diff --git a/wig2png/Makefile.in b/wig2png/Makefile.in
@@ -0,0 +1,21 @@
+BINDIR = ../bin
+SRCDIR = src
+
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@ -include $(SRCDIR)/config.h
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+CXXARGS = $(CXXFLAGS) $(LDFLAGS) $(LIBS)
+
+WIG2PNG_TARGET = $(BINDIR)/wig2png
+WIG2PNG_SRCFILES = $(SRCDIR)/wig2png.cc $(SRCDIR)/opts_list.cc
+
+all: $(WIG2PNG_TARGET)
+
+clean:
+	rm $(WIG2PNG_TARGET)
+
+$(WIG2PNG_TARGET): $(WIG2PNG_SRCFILES)
+	$(CXX) $(CXXARGS) -o $@ $(WIG2PNG_SRCFILES)
+
+.PHONY: all clean
diff --git a/configure → wig2png/configure b/configure → wig2png/configure
diff --git a/src/config.h.in → wig2png/src/config.h.in b/src/config.h.in → wig2png/src/config.h.in
diff --git a/src/macros.h → wig2png/src/macros.h b/src/macros.h → wig2png/src/macros.h
diff --git a/src/opts_list.cc → wig2png/src/opts_list.cc b/src/opts_list.cc → wig2png/src/opts_list.cc
diff --git a/src/opts_list.h → wig2png/src/opts_list.h b/src/opts_list.h → wig2png/src/opts_list.h
diff --git a/src/wig2png.cc → wig2png/src/wig2png.cc b/src/wig2png.cc → wig2png/src/wig2png.cc