1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87
|
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -182,15 +182,15 @@
ifeq ($(PYTHON_PLATFORM),win32)
# Windows -- Only MinGW is directly supported.
- CXX_RULE = $(DEFAULT_CXX_RULE)
- CXX_DEPRULE = $(GXX3_DEPRULE)
- LINK_RULE = $(WIN32_DLLRULE)
+ CXX_RULE = $(_DEFAULT_CXX_RULE)
+ CXX_DEPRULE = $(_GXX3_DEPRULE)
+ LINK_RULE = $(_WIN32_DLLRULE)
CVISUAL_CPPFLAGS += $(WIN32_CPPFLAGS)
CVISUAL_LIBS += $(WIN32_LIBS)
CVISUAL_LDFLAGS += $(WIN32_LDFLAGS)
PLATFORM_TARGET = cvisual.dll
PLATFORM_OBJS = platwin.lo wgl.lo
- INSTALL_RULE = $(GENERIC_INSTALLRULE)
+ INSTALL_RULE = $(_GENERIC_INSTALLRULE)
else
# These options are common to both Linux and OSX.
CVISUAL_LIBS += $(GTK_LIBS) $(GTKGL_LIBS) $(GTHREAD_LIBS) -lboost_python
@@ -201,20 +201,20 @@
ifeq ($(PYTHON_PLATFORM),darwin)
# Special rules for OSX
- CXX_RULE = $(DEFAULT_CXX_RULE)
- CXX_DEPRULE = $(GXX3_DEPRULE)
- LINK_RULE = $(OSX_SORULE)
+ CXX_RULE = $(_DEFAULT_CXX_RULE)
+ CXX_DEPRULE = $(_GXX3_DEPRULE)
+ LINK_RULE = $(_OSX_SORULE)
PLATFORM_TARGET = cvisualmodule.so
CVISUAL_CPPFLAGS += $(OSX_CPPFLAGS)
- INSTALL_RULE = $(GENERIC_INSTALLRULE)
+ INSTALL_RULE = $(_GENERIC_INSTALLRULE)
else
# Libtoolish rules. These should apply to all POSIX-like systems.
- CXX_RULE = $(LT_CXX_RULE)
- CXX_DEPRULE = $(LT_DEPRULE)
- LINK_RULE = $(LT_LINKRULE)
+ CXX_RULE = $(_LT_CXX_RULE)
+ CXX_DEPRULE = $(_LT_DEPRULE)
+ LINK_RULE = $(_LT_LINKRULE)
PLATFORM_TARGET = cvisualmodule.la
CVISUAL_LIBS += -lstdc++
- INSTALL_RULE = $(LT_INSTALLRULE)
+ INSTALL_RULE = $(_LT_INSTALLRULE)
endif
endif
@@ -245,12 +245,15 @@
$(LINK_RULE)
log_message:
- @echo This is a quiet Makefile. If make exits with an error, check \
- src/build.log to see the complete error message\(s\). In the event \
+ @echo Upstream meant this as a quiet Makefile, but Debian Policy \
+ mandates emitting warning to help porting to new architectures. \
+ If make exits with an error, do *not* check src/build.log as \
+ upstream describes, but instead save the output of the build \
+ \(this is done automatically by build daemons and if using debuild \
+ to build the package\) to see the complete error message\(s\). In the event \
of an error that you cannot debug, please send a message to \
visualpython-users@lists.sourceforge.net, including the files config.log \
and src/build.log, requesting assistance.
- @echo "Spoken once" >> $@
clean:
ifneq ($(PYTHON_PLATFORM),darwin)
@@ -283,14 +286,11 @@
# Strips the platform-specific plugin lib after installing it.
install-strip: install
- @echo stripping $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET) ...
ifneq ($(PYTHON_PLATFORM),darwin)
- @echo $(STRIP) $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET) >> $(LOGFILE)
- @$(STRIP) $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET) 2>> $(LOGFILE) 1>&2
+ $(STRIP) $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET)
else
# On OSX
- @echo $(STRIP) -x $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET) >> $(LOGFILE)
- @$(STRIP) -x $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET) 2>> $(LOGFILE) 1>&2
+ $(STRIP) -x $(DESTDIR)$(pythondir)/$(PLATFORM_TARGET)
endif
uninstall:
|