use RPM_OPT_FLAG
This commit is contained in:
Than Ngo
parent
77ab493683
commit
e15ff8d4ea
@ -1,7 +1,36 @@
|
||||
diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
|
||||
--- doxygen-1.5.5/Makefile.in.me 2008-02-20 14:36:50.000000000 +0100
|
||||
+++ doxygen-1.5.5/Makefile.in 2008-02-20 14:37:12.000000000 +0100
|
||||
@@ -7,7 +7,6 @@ clean: FORCE
|
||||
diff -up doxygen-1.5.8/configure.system-png doxygen-1.5.8/configure
|
||||
--- doxygen-1.5.8/configure.system-png 2009-02-06 17:17:34.000000000 +0100
|
||||
+++ doxygen-1.5.8/configure 2009-02-06 17:17:34.000000000 +0100
|
||||
@@ -576,7 +576,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
|
||||
EOF
|
||||
fi
|
||||
|
||||
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
|
||||
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
|
||||
|
||||
for i in $f_inmakefiles ; do
|
||||
SRC=$i
|
||||
@@ -593,7 +593,6 @@ EOF
|
||||
echo "" >> $DST
|
||||
echo "all: src/version.cpp " >> $DST
|
||||
echo " \$(MAKE) -C qtools" >> $DST
|
||||
- echo " \$(MAKE) -C libpng" >> $DST
|
||||
echo " \$(MAKE) -C libmd5" >> $DST
|
||||
echo " \$(MAKE) -C src" >> $DST
|
||||
if test $f_wizard = YES; then
|
||||
@@ -617,7 +616,7 @@ EOF
|
||||
echo " Created $DST from $SRC..."
|
||||
done
|
||||
|
||||
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
|
||||
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
|
||||
|
||||
for i in $f_inprofiles ; do
|
||||
SRC=$i
|
||||
diff -up doxygen-1.5.8/Makefile.in.system-png doxygen-1.5.8/Makefile.in
|
||||
--- doxygen-1.5.8/Makefile.in.system-png 2009-02-06 17:17:34.000000000 +0100
|
||||
+++ doxygen-1.5.8/Makefile.in 2009-02-06 17:17:34.000000000 +0100
|
||||
@@ -9,7 +9,6 @@ clean: FORCE
|
||||
cd doc ; $(MAKE) clean
|
||||
cd qtools ; $(MAKE) clean
|
||||
cd src ; $(MAKE) clean
|
||||
@ -9,7 +38,7 @@ diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
|
||||
cd libmd5 ; $(MAKE) clean
|
||||
cd addon/doxywizard ; $(MAKE) clean
|
||||
cd addon/doxmlparser/src ; $(MAKE) clean
|
||||
@@ -18,7 +17,6 @@ clean: FORCE
|
||||
@@ -20,7 +19,6 @@ clean: FORCE
|
||||
|
||||
distclean: clean
|
||||
cd src ; $(MAKE) distclean
|
||||
@ -17,7 +46,7 @@ diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
|
||||
cd libmd5 ; $(MAKE) distclean
|
||||
cd addon/doxywizard ; $(MAKE) distclean
|
||||
cd addon/doxmlparser/src ; $(MAKE) distclean
|
||||
@@ -32,11 +30,10 @@ distclean: clean
|
||||
@@ -34,11 +32,10 @@ distclean: clean
|
||||
-rm -f objects/*.o
|
||||
-rm -f src/Makefile.doxygen src/Makefile.libdoxygen
|
||||
-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
|
||||
@ -29,8 +58,8 @@ diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
|
||||
+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
|
||||
-rm -f src/version.cpp
|
||||
-rm -r addon/doxywizard/Makefile
|
||||
-rm -f addon/doxywizard/Makefile.doxywizard
|
||||
@@ -83,7 +80,7 @@ docs: FORCE
|
||||
-rm -f addon/doxywizard/doxywizard.pro
|
||||
@@ -75,7 +72,7 @@ docs: FORCE
|
||||
pdf: docs
|
||||
cd latex ; $(MAKE)
|
||||
|
||||
@ -39,61 +68,9 @@ diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
|
||||
qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
|
||||
Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
|
||||
VERSION packages winbuild
|
||||
diff -up doxygen-1.5.5/configure.me doxygen-1.5.5/configure
|
||||
--- doxygen-1.5.5/configure.me 2008-02-20 14:35:56.000000000 +0100
|
||||
+++ doxygen-1.5.5/configure 2008-02-20 14:36:42.000000000 +0100
|
||||
@@ -540,7 +540,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
|
||||
EOF
|
||||
fi
|
||||
|
||||
-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
|
||||
+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
|
||||
|
||||
for i in $f_inmakefiles ; do
|
||||
SRC=$i
|
||||
@@ -557,7 +557,6 @@ EOF
|
||||
echo "" >> $DST
|
||||
echo "all: src/version.cpp " >> $DST
|
||||
echo " \$(MAKE) -C qtools" >> $DST
|
||||
- echo " \$(MAKE) -C libpng" >> $DST
|
||||
echo " \$(MAKE) -C libmd5" >> $DST
|
||||
echo " \$(MAKE) -C src" >> $DST
|
||||
if test $f_wizard = YES; then
|
||||
@@ -577,7 +576,7 @@ EOF
|
||||
echo " Created $DST from $SRC..."
|
||||
done
|
||||
|
||||
-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
|
||||
+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in"
|
||||
|
||||
for i in $f_inprofiles ; do
|
||||
SRC=$i
|
||||
diff -up doxygen-1.5.5/src/pngenc.cpp.me doxygen-1.5.5/src/pngenc.cpp
|
||||
--- doxygen-1.5.5/src/pngenc.cpp.me 2008-02-20 14:38:46.000000000 +0100
|
||||
+++ doxygen-1.5.5/src/pngenc.cpp 2008-02-20 14:39:11.000000000 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#endif
|
||||
|
||||
#define ALL_STATIC
|
||||
-#include <../libpng/png.h>
|
||||
+#include <png.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
diff -up doxygen-1.5.5/src/libdoxygen.pro.in.me doxygen-1.5.5/src/libdoxygen.pro.in
|
||||
--- doxygen-1.5.5/src/libdoxygen.pro.in.me 2008-02-20 14:38:08.000000000 +0100
|
||||
+++ doxygen-1.5.5/src/libdoxygen.pro.in 2008-02-20 14:38:29.000000000 +0100
|
||||
@@ -224,7 +224,6 @@ win32-msvc:TMAKE_CXXFLAGS += -Zm200
|
||||
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
INCLUDEPATH += ../qtools
|
||||
-INCLUDEPATH += ../libpng
|
||||
INCLUDEPATH += ../libmd5
|
||||
win32:INCLUDEPATH += .
|
||||
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
|
||||
diff -up doxygen-1.5.5/src/doxygen.pro.in.me doxygen-1.5.5/src/doxygen.pro.in
|
||||
--- doxygen-1.5.5/src/doxygen.pro.in.me 2008-02-20 14:37:34.000000000 +0100
|
||||
+++ doxygen-1.5.5/src/doxygen.pro.in 2008-02-20 14:37:54.000000000 +0100
|
||||
diff -up doxygen-1.5.8/src/doxygen.pro.in.system-png doxygen-1.5.8/src/doxygen.pro.in
|
||||
--- doxygen-1.5.8/src/doxygen.pro.in.system-png 2008-01-01 11:40:58.000000000 +0100
|
||||
+++ doxygen-1.5.8/src/doxygen.pro.in 2009-02-06 17:17:34.000000000 +0100
|
||||
@@ -28,7 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
|
||||
win32:TMAKE_CXXFLAGS += -DQT_NODLL
|
||||
win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
|
||||
@ -103,3 +80,29 @@ diff -up doxygen-1.5.5/src/doxygen.pro.in.me doxygen-1.5.5/src/doxygen.pro.in
|
||||
#win32-g++:INCLUDEPATH -= ../libpng
|
||||
DESTDIR = ../bin
|
||||
TARGET = doxygen
|
||||
diff -up doxygen-1.5.8/src/libdoxygen.pro.in.system-png doxygen-1.5.8/src/libdoxygen.pro.in
|
||||
--- doxygen-1.5.8/src/libdoxygen.pro.in.system-png 2008-10-19 15:50:34.000000000 +0200
|
||||
+++ doxygen-1.5.8/src/libdoxygen.pro.in 2009-02-06 18:15:08.000000000 +0100
|
||||
@@ -233,9 +233,8 @@ SOURCES = ce_lex.cpp \
|
||||
win32:TMAKE_CXXFLAGS += -DQT_NODLL
|
||||
win32-msvc:TMAKE_CXXFLAGS += -Zm200
|
||||
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
-linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
|
||||
+linux-g++:TMAKE_CXXFLAGS +=
|
||||
INCLUDEPATH += ../qtools
|
||||
-INCLUDEPATH += ../libpng
|
||||
INCLUDEPATH += ../libmd5
|
||||
win32:INCLUDEPATH += .
|
||||
win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5
|
||||
diff -up doxygen-1.5.8/src/pngenc.cpp.system-png doxygen-1.5.8/src/pngenc.cpp
|
||||
--- doxygen-1.5.8/src/pngenc.cpp.system-png 2008-01-01 11:41:08.000000000 +0100
|
||||
+++ doxygen-1.5.8/src/pngenc.cpp 2009-02-06 17:17:34.000000000 +0100
|
||||
@@ -25,7 +25,7 @@
|
||||
#endif
|
||||
|
||||
#define ALL_STATIC
|
||||
-#include <../libpng/png.h>
|
||||
+#include <png.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
74
doxygen-1.5.8-config.patch
Normal file
74
doxygen-1.5.8-config.patch
Normal file
@ -0,0 +1,74 @@
|
||||
diff -up doxygen-1.5.8/configure.orig doxygen-1.5.8/configure
|
||||
--- doxygen-1.5.8/configure.orig 2008-12-26 20:22:39.000000000 +0100
|
||||
+++ doxygen-1.5.8/configure 2009-02-06 11:00:44.000000000 +0100
|
||||
@@ -485,6 +485,7 @@ INSTTOOL = $f_insttool
|
||||
DOXYDOCS = ..
|
||||
DOCDIR = $f_docdir
|
||||
QTDIR = $QTDIR
|
||||
+MAN1DIR = share/man/man1
|
||||
EOF
|
||||
|
||||
if test "$f_dot" != NO; then
|
||||
diff -up doxygen-1.5.8/addon/doxywizard/Makefile.in.orig doxygen-1.5.8/addon/doxywizard/Makefile.in
|
||||
--- doxygen-1.5.8/addon/doxywizard/Makefile.in.orig 2009-02-06 14:55:30.000000000 +0100
|
||||
+++ doxygen-1.5.8/addon/doxywizard/Makefile.in 2009-02-06 14:56:08.000000000 +0100
|
||||
@@ -29,11 +29,11 @@ distclean: Makefile.doxywizard
|
||||
$(RM) Makefile.doxywizard
|
||||
|
||||
install:
|
||||
- $(INSTTOOL) -d $(INSTALL)/bin
|
||||
- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin
|
||||
- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
|
||||
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
|
||||
+ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin
|
||||
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
|
||||
cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
|
||||
- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
|
||||
+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
|
||||
rm doxywizard.1
|
||||
|
||||
FORCE:
|
||||
diff -up doxygen-1.5.8/Makefile.in.orig doxygen-1.5.8/Makefile.in
|
||||
--- doxygen-1.5.8/Makefile.in.orig 2009-02-06 15:00:41.000000000 +0100
|
||||
+++ doxygen-1.5.8/Makefile.in 2009-02-06 15:00:54.000000000 +0100
|
||||
@@ -44,8 +44,6 @@ distclean: clean
|
||||
|
||||
DATE=$(shell date "+%B %Y")
|
||||
|
||||
-MAN1DIR = man/man1
|
||||
-
|
||||
install: doxywizard_install
|
||||
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
|
||||
$(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
|
||||
diff -up doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf.orig doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf
|
||||
--- doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf.orig 2009-02-06 17:08:45.000000000 +0100
|
||||
+++ doxygen-1.5.8/tmake/lib/linux-g++/tmake.conf 2009-02-06 17:12:16.000000000 +0100
|
||||
@@ -11,7 +11,7 @@ TMAKE_CC = gcc
|
||||
TMAKE_CFLAGS = -pipe
|
||||
TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions
|
||||
TMAKE_CFLAGS_WARN_OFF =
|
||||
-TMAKE_CFLAGS_RELEASE = -O2
|
||||
+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS)
|
||||
TMAKE_CFLAGS_DEBUG = -g
|
||||
TMAKE_CFLAGS_SHLIB = -fPIC
|
||||
TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
|
||||
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YAC
|
||||
|
||||
TMAKE_INCDIR =
|
||||
TMAKE_LIBDIR =
|
||||
-TMAKE_INCDIR_X11 = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib
|
||||
-TMAKE_INCDIR_QT = $(QTDIR)/include
|
||||
-TMAKE_LIBDIR_QT = $(QTDIR)/lib
|
||||
-TMAKE_INCDIR_OPENGL = /usr/X11R6/include
|
||||
-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
|
||||
+TMAKE_INCDIR_X11 =
|
||||
+TMAKE_LIBDIR_X11 =
|
||||
+TMAKE_INCDIR_QT =
|
||||
+TMAKE_LIBDIR_QT =
|
||||
+TMAKE_INCDIR_OPENGL =
|
||||
+TMAKE_LIBDIR_OPENGL =
|
||||
|
||||
TMAKE_LINK = g++
|
||||
TMAKE_LINK_SHLIB = g++
|
||||
diff -up doxygen-1.5.8/tmake/lib/macosx-uni-c++/tmake.conf.orig doxygen-1.5.8/tmake/lib/macosx-uni-c++/tmake.conf
|
||||
@ -6,46 +6,7 @@ diff -up doxygen-1.5.8/configure.qt4 doxygen-1.5.8/configure
|
||||
echo " QTDIR environment variable not set!"
|
||||
echo -n " Checking for Qt..."
|
||||
- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
|
||||
+ for d in /usr/{lib,lib64,share,qt}/{qt-4,qt4,qt,qt*,4}; do
|
||||
+ for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
|
||||
if test -x "$d/bin/qmake"; then
|
||||
QTDIR=$d
|
||||
fi
|
||||
@@ -485,6 +485,7 @@ INSTTOOL = $f_insttool
|
||||
DOXYDOCS = ..
|
||||
DOCDIR = $f_docdir
|
||||
QTDIR = $QTDIR
|
||||
+MAN1DIR = share/man/man1
|
||||
EOF
|
||||
|
||||
if test "$f_dot" != NO; then
|
||||
diff -up doxygen-1.5.8/addon/doxywizard/Makefile.in.orig doxygen-1.5.8/addon/doxywizard/Makefile.in
|
||||
--- doxygen-1.5.8/addon/doxywizard/Makefile.in.orig 2009-02-06 14:55:30.000000000 +0100
|
||||
+++ doxygen-1.5.8/addon/doxywizard/Makefile.in 2009-02-06 14:56:08.000000000 +0100
|
||||
@@ -29,11 +29,11 @@ distclean: Makefile.doxywizard
|
||||
$(RM) Makefile.doxywizard
|
||||
|
||||
install:
|
||||
- $(INSTTOOL) -d $(INSTALL)/bin
|
||||
- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin
|
||||
- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
|
||||
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin
|
||||
+ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin
|
||||
+ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR)
|
||||
cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
|
||||
- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
|
||||
+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1
|
||||
rm doxywizard.1
|
||||
|
||||
FORCE:
|
||||
diff -up doxygen-1.5.8/Makefile.in.orig doxygen-1.5.8/Makefile.in
|
||||
--- doxygen-1.5.8/Makefile.in.orig 2009-02-06 15:00:41.000000000 +0100
|
||||
+++ doxygen-1.5.8/Makefile.in 2009-02-06 15:00:54.000000000 +0100
|
||||
@@ -44,8 +44,6 @@ distclean: clean
|
||||
|
||||
DATE=$(shell date "+%B %Y")
|
||||
|
||||
-MAN1DIR = man/man1
|
||||
-
|
||||
install: doxywizard_install
|
||||
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
|
||||
$(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user