Permalink
Browse files

fix LIBSRC (wildcard was wrong)

  • Loading branch information...
1 parent e51ee94 commit a85a74305912eb73de2c8f8f1f0ed7cd4332fd30 @nniclausse nniclausse committed Aug 23, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 Makefile.in
View
@@ -100,9 +100,10 @@ TEMPLATES = $(wildcard $(ESRC)/templates/*.thtml)
TEMPLATES += $(wildcard $(ESRC)/templates/*.js)
TMP = $(wildcard *~) $(wildcard src/*~) $(wildcard inc/*~)
INC_FILES = $(wildcard $(INC)/*.hrl)
-LIBSRC = $(wildcard $(ESRC)/lib/[^mochi]*.erl)
+MOCHI = $(wildcard $(ESRC)/lib/mochi*.erl)
+LIBSRC = $(filter-out $(MOCHI), $(wildcard $(ESRC)/lib/*.erl))
ifeq ($(USEMOCHIWEBLIBS),yes)
-LIBSRC += $(wildcard $(ESRC)/lib/mochi*.erl)
+LIBSRC += $(MOCHI)
endif
TESTSRC = $(wildcard $(ESRC)/test/*.erl)
SRC = $(wildcard $(ESRC)/$(APPLICATION)/*.erl)
@@ -210,6 +211,9 @@ deb:
debian/rules build
fakeroot debian/rules binary
+show:
+ @echo $(LIBSRC)
+
clean:
-cd priv && rm -f $(shell ls priv | grep -v builder\.erl| grep -v CVS) && cd ..
-rm -f $(TARGET) $(TMP) $(BUILD_OPTIONS_FILE) builder.beam

0 comments on commit a85a743

Please sign in to comment.