From 019c0e56579fe7f94982434d8efcd7b00d8df0aa Mon Sep 17 00:00:00 2001
From: Miller Puckette <millerpuckette@users.sourceforge.net>
Date: Fri, 28 Dec 2007 03:43:06 +0000
Subject: ... and again trying to check in 0.41-0 test 10

svn path=/trunk/; revision=9108
---
 pd/src/makefile.in | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'pd/src/makefile.in')

diff --git a/pd/src/makefile.in b/pd/src/makefile.in
index d77d4ac4..b4ad8217 100644
--- a/pd/src/makefile.in
+++ b/pd/src/makefile.in
@@ -59,7 +59,7 @@ SRC = g_canvas.c g_graph.c g_text.c g_rtext.c g_array.c g_template.c g_io.c \
 
 OBJ = $(SRC:.c=.o) 
 
-GSRC =  t_main.c t_tkcmd.c
+GSRC =  @GUISRC@
 
 GOBJ = $(GSRC:.c=.o)
 
@@ -83,10 +83,10 @@ endif
 
 .PHONY: pd gui externs all
 
-all: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
+all: pd $(BIN_DIR)/pd-watchdog gui $(BIN_DIR)/pdsend \
     $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk externs
 
-bin: $(PDEXEC) $(BIN_DIR)/pd-watchdog $(BIN_DIR)/$(GUINAME) $(BIN_DIR)/pdsend \
+bin: pd $(BIN_DIR)/pd-watchdog gui $(BIN_DIR)/pdsend \
     $(BIN_DIR)/pdreceive  $(BIN_DIR)/pd.tk
 
 $(OBJ) : %.o : %.c
@@ -100,7 +100,11 @@ $(ASIOOBJ): %.o : %.cpp
 
 pd: $(PDEXEC)
 
+ifneq ($(GSRC),)
 gui: $(BIN_DIR)/$(GUINAME)
+else
+gui:
+endif
 
 pd-watchdog: $(BIN_DIR)/pd-watchdog
 
@@ -118,7 +122,7 @@ $(BIN_DIR)/pdreceive: u_pdreceive.c $(BIN_DIR)
 
 $(PDEXEC): $(OBJ) $(BIN_DIR)
 	cd ../obj;  $(CC) $(LDFLAGS) $(DBG_CFLAGS) -o $(PDEXEC) $(OBJ) $(LIB)
-        
+
 $(BIN_DIR)/pd-gui: $(GOBJ) $(GSRC)
 	cd ../obj; $(CC) $(INCLUDE) -o $(BIN_DIR)/$(GUINAME) $(GOBJ) $(GLIB)
 
@@ -170,12 +174,12 @@ install:  all
 	for dir in $(shell ls -1 ../doc | grep -v CVS); do \
 		echo "installing $$dir"; \
 		install -d $(pddocdir)/$$dir ; \
-		install -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \
+		install -m644 -p ../doc/$$dir/*.* $(pddocdir)/$$dir ; \
 	done
 	for dir in $(shell ls -1 ../doc/7.stuff | grep -v CVS); do \
 		echo "installing 7.stuff/$$dir"; \
 		install -d $(pddocdir)/7.stuff/$$dir ; \
-		install -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \
+		install -m644 -p ../doc/7.stuff/$$dir/*.* $(pddocdir)/7.stuff/$$dir ; \
 	done
 	mv $(ABOUT_FILE) $(ABOUT_FILE).tmp
 	cat $(ABOUT_FILE).tmp | sed 's|PD_VERSION|Pd version $(PD_VERSION)|' \
-- 
cgit v1.2.1