[Octave-cvsupdate] octave-forge/main/comm/src Makefile,1.3,1.4

[David B. <ad...@us...>]

Update of /cvsroot/octave/octave-forge/main/comm/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24433/src

Modified Files:
	Makefile 
Log Message:
Get rid of redundant build code. Fixes build issue on Solaris

Index: Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/comm/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	6 Oct 2006 10:17:42 -0000	1.3
+++ Makefile	25 Oct 2006 03:54:56 -0000	1.4
@@ -12,8 +12,6 @@
 OTHERTARGETS = $(patsubst %.cc,%.oct,$(OTHERSOURCES))
 OTHEROBJECTS = $(patsubst %.cc,%.o,$(OTHERSOURCES))
 OTHERDEPENDS = $(patsubst %.cc,%.d,$(OTHERSOURCES))
-##SUBDIRS = ../doc
-SUBDIRS = 
 
 TARGETS = $(GALOISTARGET) $(OTHERTARGETS)
 SOURCES = $(GALOISSOURCES) $(OTHERSOURCES)
@@ -30,12 +28,12 @@
 DEFINES = -DGALOIS_DISP_PRIVATES
 MOFLAGS =
 
-.PHONY: all dist clean realclean count $(SUBDIRS)
+.PHONY: all dist clean realclean count
 .SUFFIXES:
 
-all : $(DEPENDS) $(OTHERTARGETS) $(GALOISTARGET) $(SUBDIRS)
+all : $(DEPENDS) $(OTHERTARGETS) $(GALOISTARGET)
 
-install : $(SUBDIRS)
+install :
 	@$(INSTALL) -d $(DESTDIR)$(MPATH)/comm
 
 $(GALOISTARGET) : $(DEPENDS) $(GALOISOBJECTS) 
@@ -46,13 +44,6 @@
   sinclude $(DEPENDS)
 endif
 
-$(SUBDIRS) :
-	@if test -z "$(MAKECMDGOALS)" ; then \
-	    cd $@ && $(MAKE) ; \
-	elif grep -q "^$(MAKECMDGOALS) *[:]" $@/Makefile ; then \
-	    cd $@ && $(MAKE) $(MAKECMDGOALS) ; \
-	fi
-
 %.oct : %.d %.o
 	@echo "Linking $@"; \
 	$(MKOCTFILE) $(MOFLAGS) $(@:.oct=.o) -o $@
@@ -65,16 +56,16 @@
 	@echo "Compiling $@"; \
 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $< 
 
-clean: $(SUBDIRS)
+clean:
 	@echo "Cleaning..."; \
 	$(RM) -f $(DELETES)
 
-realclean: $(SUBDIRS)
+realclean:
 	@echo "Cleaning..."; \
 	$(RM) -f $(DELETES)
 
-dist: $(SUBDIRS)
+dist:
 
-count: $(SUBDIRS)
+count:
 	wc *{.cc,.h,.m,.txi}