changed CPPFLAGS to CXXFLAGS

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makelib.env.in b/src/makelib.env.in
index ca760d7c5870bb8baed39f9815bac6dad2ee0c42..9ad3b1c6253afc73c29f5fafa357f2056439b871 100644 (file)
--- a/src/makelib.env.in
+++ b/src/makelib.env.in
@@ -34,10 +34,10 @@ INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 
-TARGETLIB_STATIC = $(TARGET_LIBNAME).a
-TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE)
-TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT)
-TARGETLIB_LINK2 = $(TARGET_LIBNAME).so
+TARGETLIB_STATIC = ${TARGET_LIBNAME}.a
+TARGETLIB_SHARED = ${TARGET_LIBNAME}.so.${LIBVERSION_CURRENT}.${LIBVERSION_REVISION}.${LIBVERSION_AGE}
+TARGETLIB_LINK1 = ${TARGET_LIBNAME}.so.${LIBVERSION_CURRENT}
+TARGETLIB_LINK2 = ${TARGET_LIBNAME}.so
 
 TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 
@@ -45,82 +45,82 @@ TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@
 .SUFFIXES:     .o .cpp .c .cxx
 
 .c.o :
-       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
+       ${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${PICFLAGS} -o $@ $<
 
 .cpp.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${PICFLAGS} -o $@ $<
 
 .cxx.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
+       ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${PICFLAGS} -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf
+VPATH = @PATH_IFS@${top_srcdir}/${libsrc_dir} # ':' for autoconf
 
-include $(top_builddir)/src/make.env
+include ${top_builddir}/src/make.env
 
 
 all: libtype_@WX_TARGET_LIBRARY_TYPE@
 
 libtype_so: CREATE_LINKS
 
-libtype_a: $(TARGETLIB_STATIC)
+libtype_a: ${TARGETLIB_STATIC}
 
 
-$(TARGETLIB_SHARED): $(OBJECTS)
-       @$(INSTALL) -d $(top_builddir)/lib
-       $(SHARED_LD) $(top_builddir)/lib/$@ $(TARGETLIB_SONAME) $(OBJECTS)
+${TARGETLIB_SHARED}: ${OBJECTS}
+       @${INSTALL} -d ${top_builddir}/lib
+       ${SHARED_LD} ${top_builddir}/lib/$@ ${TARGETLIB_SONAME} ${OBJECTS}
 
-CREATE_LINKS: $(TARGETLIB_SHARED)
-       cd $(top_builddir)/lib \
-               && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \
-               && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
-               && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
+CREATE_LINKS: ${TARGETLIB_SHARED}
+       cd ${top_builddir}/lib \
+               && ${RM} ${TARGETLIB_LINK1} ${TARGETLIB_LINK2} \
+               && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK1} \
+               && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK2}
 
-$(TARGETLIB_STATIC): $(OBJECTS)
-       @$(INSTALL) -d $(top_builddir)/lib
-       ar $(AROPTIONS) $(top_builddir)/lib/$@ $(OBJECTS)
-       $(RANLIB) $(top_builddir)/lib/$@
+${TARGETLIB_STATIC}: ${OBJECTS}
+       @${INSTALL} -d ${top_builddir}/lib
+       ar ${AROPTIONS} ${top_builddir}/lib/$@ ${OBJECTS}
+       ${RANLIB} ${top_builddir}/lib/$@
 
 install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers
 
 install_so:
-       $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED)
-       @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2)
-       cd $(libdir) \
-               && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \
-               && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2)
+       ${INSTALL_PROGRAM} ${top_builddir}/lib/${TARGETLIB_SHARED} ${libdir}/${TARGETLIB_SHARED}
+       @${RM} ${libdir}/${TARGETLIB_LINK1} ${libdir}/${TARGETLIB_LINK2}
+       cd ${libdir} \
+               && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK1} \
+               && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK2}
 
 install_a:
-       $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC)
+       ${INSTALL_PROGRAM} ${top_builddir}/lib/${TARGETLIB_STATIC} ${libdir}/${TARGETLIB_STATIC}
 
 install_headers:
-       $(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR)
-       @for h in $(HEADERS); do \
-         $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
-         echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \
+       ${INSTALL} -d ${includedir}/wx/${HEADER_SUBDIR}
+       @for h in ${HEADERS}; do \
+         ${INSTALL_DATA} ${HEADER_PATH}/${HEADER_SUBDIR}/$$h ${includedir}/wx/${HEADER_SUBDIR}/$$h; \
+         echo "installing ${includedir}/wx/${HEADER_SUBDIR}/$$h"; \
        done
 
 uninstall:
-       $(RM) $(libdir)/$(TARGETLIB_STATIC)
-       $(RM) $(libdir)/$(TARGETLIB_SHARED)
-       $(RM) $(libdir)/$(TARGETLIB_LINK1)
-       $(RM) $(libdir)/$(TARGETLIB_LINK2)
+       ${RM} ${libdir}/${TARGETLIB_STATIC}
+       ${RM} ${libdir}/${TARGETLIB_SHARED}
+       ${RM} ${libdir}/${TARGETLIB_LINK1}
+       ${RM} ${libdir}/${TARGETLIB_LINK2}
        @echo "removing headers"
-       @for h in $(HEADERS); do \
-         $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \
+       @for h in ${HEADERS}; do \
+         ${RM} ${includedir}/wx/${HEADER_SUBDIR}/$$h; \
        done
-       @if test -d $(includedir)/wx/$(HEADER_SUBDIR); then \
-         rmdir $(includedir)/wx/$(HEADER_SUBDIR); \
+       @if test -d ${includedir}/wx/${HEADER_SUBDIR}; then \
+         rmdir ${includedir}/wx/${HEADER_SUBDIR}; \
        fi
-       @-rmdir $(includedir)/wx
+       @-rmdir ${includedir}/wx
 
 clean:
-       $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \
-             $(top_builddir)/lib/$(TARGETLIB_LINK1) \
-             $(top_builddir)/lib/$(TARGETLIB_LINK2) \
-             $(top_builddir)/lib/$(TARGETLIB_STATIC) core
+       ${RM} ${OBJECTS} ${top_builddir}/lib/${TARGETLIB_SHARED} \
+             ${top_builddir}/lib/${TARGETLIB_LINK1} \
+             ${top_builddir}/lib/${TARGETLIB_LINK2} \
+             ${top_builddir}/lib/${TARGETLIB_STATIC} core
 
 .PHONY: all shared static clean install install_static install_shared uninstall
 

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index ac5120068bcfb3cd9a43585fe4ecf7661fe2b489..3e33e6a51dd2bb96a7b67a2f95abe747959118de 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -3,53 +3,53 @@
 # Clears all default suffixes
 .SUFFIXES:     .o .cpp .c .cxx
 
-# The binary program extension, if any, including dots (e.g. '.exe')
+# The binary program extension, if any, including dots {e.g. '.exe'}
 PROGRAM_EXT = @PROGRAM_EXT@
-BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
-RES_PROGRAM = $(PROGRAM)_resources.o
+BIN_PROGRAM = ${PROGRAM}${PROGRAM_EXT}
+RES_PROGRAM = ${PROGRAM}_resources.o
 RES_PROGRAM_OPT = @RESPROGRAM@
 
 # To add resources to the Mac OS X applications
-LIBWX_MACRES = $(top_builddir)/lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r
-LIBWX_MACRESCOMP = $(RESCOMP) $(RESFLAGS) $(LIBWX_MACRES) -o $(BIN_PROGRAM)
+LIBWX_MACRES = ${top_builddir}/lib/lib@WX_LIBRARY@-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.r
+LIBWX_MACRESCOMP = ${RESCOMP} ${RESFLAGS} ${LIBWX_MACRES} -o ${BIN_PROGRAM}
 
 .c.o :
-       $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
+       ${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 .cpp.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
+       ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 .cxx.o :
-       $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
+       ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
 
 # the comment at the end of the next line is needed because otherwise autoconf
 # would remove this line completely - it contains a built-in hack to remove
 # any VPATH assignment not containing ':'
-VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf
+VPATH = @PATH_IFS@${top_srcdir}/${program_dir} # ':' for autoconf
 
 # Set defaults from configure
-include $(top_builddir)/src/make.env
+include ${top_builddir}/src/make.env
 
-all:    $(BIN_PROGRAM) install_dirs install_data
+all:    ${BIN_PROGRAM} install_dirs install_data
 
-$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT) @LIBWXMACRES@
-       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
+${BIN_PROGRAM}:        ${OBJECTS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${RES_PROGRAM_OPT} @LIBWXMACRES@
+       ${CC} ${LDFLAGS} -o ${BIN_PROGRAM} ${OBJECTS} ${LDLIBS} ${LIBRARIES} ${RES_PROGRAM_OPT}
        @LIBWXMACRESCOMP@
 
-$(RES_PROGRAM):  $(PROGRAM).rc
-       $(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)
+${RES_PROGRAM}:  ${PROGRAM}.rc
+       ${RESCOMP} ${RCINPUTSWITCH} ${top_srcdir}/${program_dir}/${PROGRAM}.rc ${RCOUTPUTSWITCH} ${PROGRAM}_resources.o ${RESFLAGS}
 
 install_dirs:
-       @list='$(DATADIRS)'; for p in $$list; do \
-         mkdir -p $(top_builddir)/$(program_dir)/$$p; \
+       @list='${DATADIRS}'; for p in $$list; do \
+         mkdir -p ${top_builddir}/${program_dir}/$$p; \
        done
        
 install_data:
-       @list='$(DATAFILES)'; for p in $$list; do \
-         if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
-            cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+       @list='${DATAFILES}'; for p in $$list; do \
+         if test ! -s ${top_builddir}/${program_dir}/$$p; then \
+            cp -pRf ${top_srcdir}/${program_dir}/$$p ${top_builddir}/${program_dir}/$$p; \
          fi; \
        done
 
 clean:
-       rm -f $(OBJECTS) $(BIN_PROGRAM)  $(RES_PROGRAM) core
+       rm -f ${OBJECTS} ${BIN_PROGRAM}  ${RES_PROGRAM} core