Check-in [430f936c3b]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More tweaks to makefiles
Timelines: family | ancestors | descendants | both | core_zip_vfs
Files: files | file ages | folders
SHA1: 430f936c3b45751271c1b36afd3e2c9d82aafafc
User & Date: hypnotoad 2014-09-03 20:41:12.005
Context
2014-09-03
21:11
Closing the hypnotoad branch check-in: 93e7e6f813 user: tne tags: core_zip_vfs
21:10
Updating hypnotoad branch Closed-Leaf check-in: b2aeca61e8 user: tne tags: hypnotoad
20:41
More tweaks to makefiles check-in: 430f936c3b user: hypnotoad tags: core_zip_vfs
20:32
Merging in changes from Tcl Reduced the code necessary to bootstrap a shell to a single C call. Re... check-in: a706cf4205 user: hypnotoad tags: core_zip_vfs
Changes
Unified Diff Ignore Whitespace Patch
Changes to unix/Makefile.in.
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
		${CC_SEARCH_FLAGS} -o ${TCL_EXE}

null.zip:
	touch .empty
	zip null.zip .empty 

${TCLKIT_EXE}: ${TCL_EXE} null.zip
	rm -f tclkit.zip
	PWD=`pwd`
	cp -f ${TCL_EXE} ${TCLKIT_EXE}
	cat null.zip >> ${TCLKIT_EXE}
	cd ${prefix}/lib ; zip -rAq ${PWD}/${TCLKIT_EXE} tcl8 tcl8.6
	
# Must be empty so it doesn't conflict with rule for ${TCL_EXE} above
${NATIVE_TCLSH}:







<







650
651
652
653
654
655
656

657
658
659
660
661
662
663
		${CC_SEARCH_FLAGS} -o ${TCL_EXE}

null.zip:
	touch .empty
	zip null.zip .empty 

${TCLKIT_EXE}: ${TCL_EXE} null.zip

	PWD=`pwd`
	cp -f ${TCL_EXE} ${TCLKIT_EXE}
	cat null.zip >> ${TCLKIT_EXE}
	cd ${prefix}/lib ; zip -rAq ${PWD}/${TCLKIT_EXE} tcl8 tcl8.6
	
# Must be empty so it doesn't conflict with rule for ${TCL_EXE} above
${NATIVE_TCLSH}:
Changes to win/Makefile.in.
422
423
424
425
426
427
428




429
430
431
432
433
434

435
436
437
438
439
440
441
$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
	$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
        tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
	@VC_MANIFEST_EMBED_EXE@

tclkit: $(TCLKIT)





$(TCLKIT): $(TCLSH)
	rm -f tclkit.zip
	PWD=`pwd`
	cd ${prefix}/lib ; zip -rq ${PWD}/tclkit.zip tcl8 tcl8.6
	cp -f $(TCLSH) $(TCLKIT)
	cat tclkit.zip >> $(TCLKIT)


cat32.$(OBJEXT): cat.c
	$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)

$(CAT32): cat32.$(OBJEXT)
	$(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LIBS) $(LDFLAGS_CONSOLE)








>
>
>
>
|
<

<
|
|
>







422
423
424
425
426
427
428
429
430
431
432
433

434

435
436
437
438
439
440
441
442
443
444
$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
	$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
        tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
	@VC_MANIFEST_EMBED_EXE@

tclkit: $(TCLKIT)

null.zip:
	touch .empty
	zip null.zip .empty
	
$(TCLKIT): $(TCLSH) null.zip

	PWD=`pwd`

	cp -f $(WISH) $(TCLKIT)
	cat null.zip >> $(TCLKIT)
	cd ${prefix}/lib ; zip -rAq ${PWD}/$(TCLKIT) tcl8 tcl8.6

cat32.$(OBJEXT): cat.c
	$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)

$(CAT32): cat32.$(OBJEXT)
	$(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LIBS) $(LDFLAGS_CONSOLE)