fix Makefiles

9 years ago · a1ecc79f8f
8 changed files with 16 additions and 16 deletions
--- a/configure.ac
+++ b/configure.ac
@ -124,17 +124,17 @@ man/Makefile
 src/Makefile
 po/Makefile.in
 themes/Makefile
-themes/antergos/css/vendor/Makefile
-themes/antergos/css/Makefile
+themes/_vendor/Makefile
+themes/_vendor/css/Makefile
+themes/_vendor/fonts/Makefile
+themes/_vendor/fonts/font-awesome/Makefile
+themes/_vendor/fonts/TTF/Makefile
+themes/_vendor/js/Makefile
 themes/antergos/Makefile
-themes/antergos/fonts/Makefile
-themes/antergos/fonts/font-awesome/Makefile
-themes/antergos/fonts/TTF/Makefile
-themes/antergos/js/vendor/Makefile
+themes/antergos/css/Makefile
 themes/antergos/js/Makefile
 themes/antergos/img/Makefile
 themes/simple/Makefile
-themes/tools/Makefile
 ])

 dnl ###########################################################################
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@ -1,4 +1,4 @@
-SUBDIRS = antergos simple tools
+SUBDIRS = antergos simple _vendor

 DISTCLEANFILES = \
 	Makefile.in
--- a/themes/_vendor/Makefile.am
+++ b/themes/_vendor/Makefile.am
@ -1,6 +1,6 @@
 SUBDIRS = \
-	css
-	fonts
+	css \
+	fonts \
 	js

 DISTCLEANFILES = \
--- a/themes/_vendor/css/Makefile.am
+++ b/themes/_vendor/css/Makefile.am
@ -1,4 +1,4 @@
-vendorcssdir = $(THEME_DIR)/vendor/css
+vendorcssdir = $(THEME_DIR)/_vendor/css
 vendorcss_DATA = bootstrap.min.css bootswatch-paper.bootstrap.min.css

 EXTRA_DIST = $(vendorcss_DATA)
--- a/themes/_vendor/fonts/TTF/Makefile.am
+++ b/themes/_vendor/fonts/TTF/Makefile.am
@ -1,4 +1,4 @@
-ttffontsdir = $(THEME_DIR)/vendor/fonts/TTF
+ttffontsdir = $(THEME_DIR)/_vendor/fonts/TTF
 ttffonts_DATA = \
 	OpenSans-Light.ttf \
 	OpenSans-Regular.ttf
--- a/themes/_vendor/fonts/font-awesome/Makefile.am
+++ b/themes/_vendor/fonts/font-awesome/Makefile.am
@ -1,4 +1,4 @@
-fawesomedir = $(THEME_DIR)/vendor/fonts/font-awesome
+fawesomedir = $(THEME_DIR)/_vendor/fonts/font-awesome
 fawesome_DATA = font-awesome.min.css fontawesome-webfont.woff2 fontawesome-webfont.woff

 EXTRA_DIST = $(fawesome_DATA)
--- a/themes/_vendor/js/Makefile.am
+++ b/themes/_vendor/js/Makefile.am
@ -1,4 +1,4 @@
-vendorjsdir = $(THEME_DIR)/vendor/js
+vendorjsdir = $(THEME_DIR)/_vendor/js
 vendorjs_DATA = \
 	bootstrap.min.js \
 	jquery.min.js \
--- a/themes/antergos/Makefile.am
+++ b/themes/antergos/Makefile.am
@ -1,9 +1,9 @@
 antergosdir = $(THEME_DIR)/antergos
 antergos_DATA = index.theme index.html COPYING README.md

-SUBDIRS = css fonts img js
+SUBDIRS = css img js

 EXTRA_DIST = $(antergos_DATA)

 DISTCLEANFILES = \
-	Makefile.in
+	Makefile.in