More samples makefiles

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

src/makeprog.env.in

@@ -1,8 +1,5 @@
 # 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
 
@@ -15,15 +12,12 @@ WXDIR       = $(WXWIN)
 .cxx.o :
 	$(CC) -c $(CPPFLAGS) -o $@ $<
 
-# this is for using the samples in ../samples/xxxxx
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
+# Set defaults from configure
+include $(top_builddir)/src/make.env
 
 all:    $(PROGRAM)
 
-$(PROGRAM):	$(OBJECTS) ../../lib/@WX_TARGET_LIBRARY@
+$(PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
 	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS)
 
 clean: