made wxPanel be auto layout aware

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

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 9bad0a0c9ec634f7b5436c232c199edbee015cd9..cd5731f96985afc7f107dc6f88274c44b1e944dc 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,18 +1,42 @@
 # Make environment for making samples on Unix
 
-# Replace this with your own path if necessary
-WXDIR       = $(WXWIN)
+# Clears all default suffixes
+.SUFFIXES:     .o .cpp .c .cxx
 
-# this is for using the samples in ../samples/xxxxx
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
+# The binary program extension, if any, including dots (e.g. '.exe')
+PROGRAM_EXT = @PROGRAM_EXT@
+BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
 
-all:    $(PROGRAM)
+.c.o :
+       $(CCC) -c $(CFLAGS) -o $@ $<
 
-$(PROGRAM):    $(OBJECTS) ../../lib/$(WXLIB)
-       $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS)
+.cpp.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+.cxx.o :
+       $(CC) -c $(CPPFLAGS) -o $@ $<
+
+VPATH = :$(top_srcdir)/$(program_dir)
+
+# Set defaults from configure
+include $(top_builddir)/src/make.env
+
+all:    $(BIN_PROGRAM) install_dirs install_data
+
+$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
+       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(EXTRALIBS) $(LDLIBS)
+
+install_dirs:
+       @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 -f $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+         fi; \
+       done
 
 clean:
-       rm -f $(OBJECTS) $(PROGRAM) core
+       rm -f $(OBJECTS) $(BIN_PROGRAM) core