Pass correct length to XTextExtents

[wxWidgets.git] / src / makeprog.env.in

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 9ae88ae94ac8f932a80549b4fc23ffa292ad7cb5..fd1a3128853a083cb580fc883b8a8769e8a6e9fc 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,26 +1,37 @@
 # Make environment for making samples on Unix
 
-# Clears all default suffixes
-.SUFFIXES:     .o .cpp .c .cxx
+# The binary program extension, if any, including dots (e.g. '.exe')
+PROGRAM_EXT = @PROGRAM_EXT@
+BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
+RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
 
-.c.o :
-       $(CCC) -c $(CFLAGS) -o $@ $<
+%.o : %.c
+       $(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.cpp.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+%.o : %.cpp
+       $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-.cxx.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+%.o : %.cxx
+       $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-VPATH = :$(top_srcdir)/$(program_dir)
+%_resources.o : %.rc
+       $(RESCOMP) -i $< -o $@ $(RESFLAGS)
+
+
+# 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
 
 # Set defaults from configure
 include $(top_builddir)/src/make.env
 
-all:    $(PROGRAM) install_dirs install_data
+all:    $(BIN_PROGRAM) install_dirs install_data
+
+$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@
+       $(CXX) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ)
+       @LIBWXMACRESCOMP@
 
-$(PROGRAM):    $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS)
 
 install_dirs:
        @list='$(DATADIRS)'; for p in $$list; do \
@@ -29,10 +40,11 @@ install_dirs:
        
 install_data:
        @list='$(DATAFILES)'; for p in $$list; do \
-         if test ! -e $(top_builddir)/$(program_dir)/Makefile.in; then \
-            cp -u $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+         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) $(PROGRAM) core
+       rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core
+