X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e877c195bc9ade6d4cb9f96bffb00e81978d740..e044f6001e70d815f72d3911ce6bd01255847ecd:/src/makeprog.env.in?ds=sidebyside

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 9bad0a0c9e..fd1a312885 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,18 +1,50 @@
 # Make environment for making samples on Unix
 
-# Replace this with your own path if necessary
-WXDIR       = $(WXWIN)
+# The binary program extension, if any, including dots (e.g. '.exe')
+PROGRAM_EXT = @PROGRAM_EXT@
+BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
+RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
 
-# this is for using the samples in ../samples/xxxxx
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
+%.o : %.c
+	$(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-all:    $(PROGRAM)
+%.o : %.cpp
+	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
 
-$(PROGRAM):	$(OBJECTS) ../../lib/$(WXLIB)
-	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LDLIBS)
+%.o : %.cxx
+	$(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $<
+
+%_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:    $(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@
+
+
+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 -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
+