75 lines
3.4 KiB
Diff
75 lines
3.4 KiB
Diff
--- propgrid/Makefile.in 2011-02-27 09:26:00.000000000 +0100
|
|
+++ propgrid-nosample/Makefile.in 2011-10-31 08:17:39.434048604 +0100
|
|
@@ -93,13 +93,6 @@
|
|
include/wx/propgrid/xh_propgrid.h
|
|
PROPGRIDSAMPLE_CXXFLAGS = -I$(srcdir)/include $(WX_CXXFLAGS) $(CPPFLAGS) \
|
|
$(CXXFLAGS)
|
|
-PROPGRIDSAMPLE_OBJECTS = \
|
|
- propgridsample_minimal.o \
|
|
- propgridsample_propgridsample.o \
|
|
- propgridsample_sampleprops.o \
|
|
- propgridsample_tests.o \
|
|
- propgridsample_xh_propgrid.o \
|
|
- $(__propgridsample___win32rc)
|
|
|
|
### Conditionally set variables: ###
|
|
|
|
@@ -195,7 +188,7 @@
|
|
|
|
### Targets: ###
|
|
|
|
-all: $(__propgrid_lib___depname) $(__propgrid_dll___depname) $(srcdir)/samples/propgridsample$(EXEEXT)
|
|
+all: $(__propgrid_lib___depname) $(__propgrid_dll___depname)
|
|
|
|
install: $(__install_propgrid_lib___depname) $(__install_propgrid_lib_headers___depname) $(__install_propgrid_dll___depname) $(__install_propgrid_dll_headers___depname)
|
|
|
|
@@ -211,7 +204,6 @@
|
|
rm -f $(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf3)
|
|
rm -f $(srcdir)/lib/$(LIBPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)
|
|
rm -f $(srcdir)/lib/$(LIBPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(srcdir)/lib/$(DLLPREFIX)wxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(__propgrid_dll___targetsuf2)
|
|
- rm -f $(srcdir)/samples/propgridsample$(EXEEXT)
|
|
|
|
distclean: clean
|
|
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
|
@@ -272,15 +264,6 @@
|
|
@COND_WX_SHARED_1@ rm -f $(DESTDIR)$(prefix)/$$f; \
|
|
@COND_WX_SHARED_1@ done
|
|
|
|
-$(srcdir)/samples/propgridsample$(EXEEXT): $(PROPGRIDSAMPLE_OBJECTS) make_sample_dir_propgridsample $(__propgridsample___win32rc) $(__propgrid_lib___depname)
|
|
- $(CXX) -o $@ $(PROPGRIDSAMPLE_OBJECTS) -L$(srcdir)/lib -L$(srcdir)/lib $(LDFLAGS_GUI) $(__propgridsample_RPATH) $(LDFLAGS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_propgrid-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) $(LIBS)
|
|
-
|
|
- $(__propgridsample___mac_setfilecmd)
|
|
- $(__propgridsample___os2_emxbindcmd)
|
|
-
|
|
-make_sample_dir_propgridsample:
|
|
- @mkdir -p $(srcdir)/samples
|
|
-
|
|
propgrid_lib_advprops.o: $(srcdir)/src/advprops.cpp
|
|
$(CXXC) -c -o $@ $(PROPGRID_LIB_CXXFLAGS) $(srcdir)/src/advprops.cpp
|
|
|
|
@@ -323,25 +306,6 @@
|
|
propgrid_dll_props.o: $(srcdir)/src/props.cpp
|
|
$(CXXC) -c -o $@ $(PROPGRID_DLL_CXXFLAGS) $(srcdir)/src/props.cpp
|
|
|
|
-propgridsample_minimal.o: $(srcdir)/samples/minimal.cpp
|
|
- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/minimal.cpp
|
|
-
|
|
-propgridsample_propgridsample.o: $(srcdir)/samples/propgridsample.cpp
|
|
- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/propgridsample.cpp
|
|
-
|
|
-propgridsample_sampleprops.o: $(srcdir)/samples/sampleprops.cpp
|
|
- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/sampleprops.cpp
|
|
-
|
|
-propgridsample_tests.o: $(srcdir)/samples/tests.cpp
|
|
- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/samples/tests.cpp
|
|
-
|
|
-propgridsample_xh_propgrid.o: $(srcdir)/src/xh_propgrid.cpp
|
|
- $(CXXC) -c -o $@ $(PROPGRIDSAMPLE_CXXFLAGS) $(srcdir)/src/xh_propgrid.cpp
|
|
-
|
|
-propgridsample_sample_rc.o: $(srcdir)/samples/sample.rc
|
|
- $(WX_RESCOMP) -i$< -o$@ --include-dir $(srcdir)/include --include-dir $(srcdir)/samples
|
|
-
|
|
-
|
|
# Include dependency info, if present:
|
|
@IF_GNU_MAKE@-include ./.deps/*.d
|
|
|