XPM updates

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

diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 667568137ce04af1681581c14292fe777abc1d99..9ee384b81467a05bc70822577a4e0ea732709042 100644 (file)
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -1,30 +1,50 @@
 # 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
 
+# 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
+RES_PROGRAM_OPT = @RESPROGRAM@
+
 .c.o :
-       $(CCC) -c $(CFLAGS) -o $@ $<
+       $(CCC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 .cpp.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+       $(CC) -c $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
 
 .cxx.o :
-       $(CC) -c $(CPPFLAGS) -o $@ $<
+       $(CC) -c $(CPPFLAGS) $(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
+
+# Set defaults from configure
+include $(top_builddir)/src/make.env
+
+all:    $(BIN_PROGRAM) install_dirs install_data
 
-# this is for using the samples in ../samples/xxxxx
-pretop_srcdir = @top_srcdir@
-top_srcdir = ../$(pretop_srcdir)
-top_builddir = ../..
-include ../../src/make.env
+$(BIN_PROGRAM):        $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT)
+       $(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
 
-all:    $(PROGRAM)
+$(RES_PROGRAM):  $(PROGRAM).rc
+       $(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)
 
-$(PROGRAM):    $(OBJECTS) ../../lib/@WX_TARGET_LIBRARY@
-       $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(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 -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
+         fi; \
+       done
 
 clean:
-       rm -f $(OBJECTS) $(PROGRAM) core
+       rm -f $(OBJECTS) $(BIN_PROGRAM)  $(RES_PROGRAM) core