--- a/Make.proto Sat Aug 26 12:57:12 2006 +0200
+++ b/Make.proto Mon Aug 28 15:36:19 2006 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.95 2006-08-23 14:31:24 cg Exp $
+# $Header: /cvs/stx/stx/libview2/Make.proto,v 1.96 2006-08-28 13:36:19 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libview2.
@@ -58,18 +58,18 @@
NT_ADDITIONAL_DEFS::
- @-echo "LIBJPEG_DIR=$$(TOP)\\support\\libjpeg-6a"
- @-echo "LIBJPEG=$$(LIBJPEG_DIR)\libjpeg.lib"
- @-echo "CLOCAL_INCL=-I$$(LIBJPEG_DIR)"
- @-echo "LOCALLIBS=$$(LIBJPEG)"
+ @-echo "LIBJPEG_DIR=$$(TOP)\\support\\libjpeg-6a"
+ @-echo "LIBJPEG=$$(LIBJPEG_DIR)\libjpeg.lib"
+ @-echo "CLOCAL_INCL=-I$$(LIBJPEG_DIR)"
+ @-echo "LOCALLIBS=$$(LIBJPEG)"
NT_ADDITIONAL_RULES::
- @-echo "ALL:: $$(LIBJPEG)"
- @-echo
- @-echo "$$(LIBJPEG):
- @-echo "#cd $$(LIBJPEG_DIR)" | tr "#" "\\011"
- @-echo "#make.exe -f makefile.bcc32" | tr "#" "\\011"
- @-echo "#cd $$(TOP)\libview2" | tr '#' "\\011"
+ @-echo "ALL:: $$(LIBJPEG)"
+ @-echo
+ @-echo "$$(LIBJPEG):
+ @-echo "#cd $$(LIBJPEG_DIR)" | tr "#" "\\011"
+ @-echo "#make.exe -f makefile.bcc32" | tr "#" "\\011"
+ @-echo "#cd $$(TOP)\libview2" | tr '#' "\\011"
all:: preMake classLibRule postMake
@@ -81,38 +81,38 @@
# prelink JPEGReader.o with libjpeg
#
JPEGReader: $(LIBJPEG)
- @$(MAKE) JPEGReader.$(O) \
- CC="$(LIBJPEG_CC)" \
- OPT="$(LIBJPEG_OPT)" \
- LOCALDEFS="-I$(LIBJPEG_DIR)" \
- LIBNAME="$(LIBNAME)" \
- STCOPT="$(STCOPT)" \
- STCLOCALOPT="$(STCLOCALOPT)" \
- CCLOCALOPT="$(CCLOCALOPT)" \
- LINKOBJRULE="$(LINKOBJRULE)"
- @if [ "$(NO_PRELINK_LIBJPEG)" = "" ]; then \
- mv JPEGReader.$(O) __JPEGReader.$(O); \
- echo; \
- echo "prelinking JPEGReader with libjpg ..."; \
- echo; \
- echo ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
- ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
- rm -f __JPEGReader.$(O); \
- echo; \
- fi
+ @$(MAKE) JPEGReader.$(O) \
+ CC="$(LIBJPEG_CC)" \
+ OPT="$(LIBJPEG_OPT)" \
+ LOCALDEFS="-I$(LIBJPEG_DIR)" \
+ LIBNAME="$(LIBNAME)" \
+ STCOPT="$(STCOPT)" \
+ STCLOCALOPT="$(STCLOCALOPT)" \
+ CCLOCALOPT="$(CCLOCALOPT)" \
+ LINKOBJRULE="$(LINKOBJRULE)"
+ @if [ "$(NO_PRELINK_LIBJPEG)" = "" ]; then \
+ mv JPEGReader.$(O) __JPEGReader.$(O); \
+ echo; \
+ echo "prelinking JPEGReader with libjpg ..."; \
+ echo; \
+ echo ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
+ ld $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
+ rm -f __JPEGReader.$(O); \
+ echo; \
+ fi
$(LIBJPEG)::
- @-echo
- @-echo "making libjpg support library ..."
- @-echo
- -(cd $(LIBJPEG_DIR) ; $(MAKE) libjpeg.a CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)")
- @-echo
+ @-echo
+ @-echo "making libjpg support library ..."
+ @-echo
+ -(cd $(LIBJPEG_DIR) ; $(MAKE) libjpeg.a CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)")
+ @-echo
Makefiles::
- -( cd $(LIBJPEG_DIR) ; configure )
+ -( cd $(LIBJPEG_DIR) ; configure )
additionalMakefiles::
- -( cd $(LIBJPEG_DIR) ; configure )
+ -( cd $(LIBJPEG_DIR) ; configure )
# add more install actions here