Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22048
Modified Files: Tag: impd_0_37 makefile.mingw Log Message: faster linking, make; make install seperate
Index: makefile.mingw =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/makefile.mingw,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** makefile.mingw 28 Mar 2004 19:29:27 -0000 1.1.2.2 --- makefile.mingw 30 Mar 2004 06:44:06 -0000 1.1.2.3 *************** *** 17,21 **** GINCLUDE = $(INCLUDE) -I../tcl/include
! LDFLAGS = -lpthreadGC -lwsock32 -lportaudio -lwinmm ../bin/tcl85.lib ../bin/tk85.lib LIB = -lm
--- 17,21 ---- GINCLUDE = $(INCLUDE) -I../tcl/include
! LDFLAGS = -lpthreadGC -lwsock32 -lportaudio -lwinmm /lib/tcl85.lib /lib/tk85.lib LIB = -lm
*************** *** 63,68 **** .PHONY: all
! all: $(OBJ_DIR)/$(GUINAME) $(OBJ_DIR)/$(PDDLL) $(OBJ_DIR)/$(PDEXEC)\ ! $(OBJ_DIR)/pdsend.exe $(OBJ_DIR)/pdreceive.exe $(BIN_DIR)/pd.tk
$(OBJ) : %.o : %.c --- 63,68 ---- .PHONY: all
! all: $(OBJ_DIR)/$(GUINAME) $(OBJ_DIR)/$(PDDLL) $(OBJ_DIR)/$(PDEXEC) \ ! $(OBJ_DIR)/pdsend.exe $(OBJ_DIR)/pdreceive.exe $(OBJ_DIR)/pd.tk
$(OBJ) : %.o : %.c *************** *** 72,112 **** $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
$(PAOBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.c
$(OBJ_DIR)/pdsend.exe: u_pdsend.o ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(OBJ_DIR)/pdsend.exe $(OBJ_DIR)/u_pdsend.o $(LDFLAGS)
$(OBJ_DIR)/pdreceive.exe: u_pdreceive.o ! $(CC) $(CFLAGS) $(STRIPFLAG) -o $(OBJ_DIR)/pdreceive.exe $(OBJ_DIR)/u_pdreceive.o $(LDFLAGS)
$(OBJ_DIR)/$(PDEXEC): s_entry.o ! cd $(OBJ_DIR); $(CC) -o $(OBJ_DIR)/$(PDEXEC) $(OBJ_DIR)/s_entry.o $(LIB) $(BIN_DIR)/pd.a $(LDFLAGS) $(OBJ_DIR)/$(PDDLL): $(OBJC) ! cd $(OBJ_DIR); $(CC) -o $(BIN_DIR)/pd.dll $(OBJC) $(BIN_DIR)/pdtcl.a $(LIB) $(LDFLAGS) ! cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pd.def \ ! --output-lib=$(BIN_DIR)/pd.a --dllname=$(BIN_DIR)/pd.dll $(OBJC) $(LDFLAGS)
$(OBJ_DIR)/$(GUINAME): t_tkcmd.o ! cd $(OBJ_DIR); $(CC) $(INCLUDE) -o $(GUINAME) t_tkcmd.o $(LIB) $(LDFLAGS) ! cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def $(BIN_DIR)/pdtcl.def \ ! --output-lib=$(BIN_DIR)/pdtcl.a --dllname=$(BIN_DIR)/$(GUINAME) $(OBJ_DIR)/t_tkcmd.o $(LDFLAGS)
! $(BIN_DIR)/pd.tk: u_main.tk ! echo set pd_nt 1 > $(BIN_DIR)/pd.tk ! grep -v "set pd_nt" < u_main.tk >> $(BIN_DIR)/pd.tk
install: all install -d $(INSTDIR)/bin ! install $(OBJ_DIR)/$(PDEXEC) $(BIN_DIR)/$(PDEXEC) install -m644 u_object.tk $(BIN_DIR)/u_object.tk - install -m 755 $(OBJ_DIR)/pdsend.exe $(BIN_DIR)/pdsend.exe - install -m 755 $(OBJ_DIR)/pdreceive.exe $(BIN_DIR)/pdreceive.exe install -m644 ../extra/*/*.pd $(INSTDIR)/doc/5.reference/
clean: ! -rm -f $(OBJ_DIR)/*.o $(OBJ_DIR)/pd*.exe $(OBJ_DIR)/pd*.dll -rm -f $(PADIR)/pablio/*.o $(PADIR)/pa_common/*.o -rm -f makefile.dependencies touch makefile.dependencies --- 72,115 ---- $(CC) $(CFLAGS) $(GFLAGS) $(GINCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c
+ $(SROBJ) : %.o : %.c + $(CC) $(CFLAGS) $(GFLAGS) $(INCLUDE) -c -o $(OBJ_DIR)/$*.o $*.c + $(PAOBJ) : %.o : %.c $(CC) $(CFLAGS) $(GFLAGS) $(INCPA) -c -o $(OBJ_DIR)/$*.o $*.c
$(OBJ_DIR)/pdsend.exe: u_pdsend.o ! cd $(OBJ_DIR); $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend.exe u_pdsend.o $(LDFLAGS)
$(OBJ_DIR)/pdreceive.exe: u_pdreceive.o ! cd $(OBJ_DIR); $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive.exe u_pdreceive.o $(LDFLAGS)
$(OBJ_DIR)/$(PDEXEC): s_entry.o ! cd $(OBJ_DIR); $(CC) -o $(PDEXEC) s_entry.o $(LIB) pd.a $(LDFLAGS) $(OBJ_DIR)/$(PDDLL): $(OBJC) ! cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pd.def \ ! --output-lib=pd.a --dllname=pd.dll $(OBJC) pdtcl.a $(LDFLAGS)
$(OBJ_DIR)/$(GUINAME): t_tkcmd.o ! cd $(OBJ_DIR); $(DLLWRAP) --export-all-symbols --output-def pdtcl.def \ ! --output-lib=pdtcl.a --dllname=$(GUINAME) t_tkcmd.o $(LDFLAGS)
! $(OBJ_DIR)/pd.tk: u_main.tk ! echo set pd_nt 1 > $(OBJ_DIR)/pd.tk ! grep -v "set pd_nt" < u_main.tk >> $(OBJ_DIR)/pd.tk
install: all install -d $(INSTDIR)/bin ! install $(OBJ_DIR)/pd*.exe $(BIN_DIR) ! install $(OBJ_DIR)/pd*.dll $(BIN_DIR) ! install -m644 $(OBJ_DIR)/pd.tk $(BIN_DIR)/pd.tk install -m644 u_object.tk $(BIN_DIR)/u_object.tk install -m644 ../extra/*/*.pd $(INSTDIR)/doc/5.reference/
clean: ! -rm -f $(OBJ_DIR)/*.o $(OBJ_DIR)/*.a $(OBJ_DIR)/*.def ! -rm -f $(OBJ_DIR)/pd*.exe $(OBJ_DIR)/pd*.dll -rm -f $(PADIR)/pablio/*.o $(PADIR)/pa_common/*.o + -rm -f $(OBJ_DIR)/pd.tk -rm -f makefile.dependencies touch makefile.dependencies *************** *** 128,133 **** -rm $(INSTDIR)/bin/pd*.exe -rm $(INSTDIR)/bin/pd*.dll ! -rm $(INSTDIR)/bin/*.a ! -rm $(INSTDIR)/bin/*.def
include makefile.dependencies --- 131,135 ---- -rm $(INSTDIR)/bin/pd*.exe -rm $(INSTDIR)/bin/pd*.dll ! -rm $(INSTDIR)/bin/*.tk
include makefile.dependencies