* [gentoo-commits] gentoo-x86 commit in media-gfx/flphoto/files: flphoto-1.3.1-linking.patch
@ 2011-01-06 12:41 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2011-01-06 12:41 UTC (permalink / raw
To: gentoo-commits
jlec 11/01/06 12:41:27
Added: flphoto-1.3.1-linking.patch
Log:
Respecting user *FLAGS$; #341665, compiling in parallel, installation of .desktop files, added support for debug and nls
(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)
Revision Changes Path
1.1 media-gfx/flphoto/files/flphoto-1.3.1-linking.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/flphoto/files/flphoto-1.3.1-linking.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/flphoto/files/flphoto-1.3.1-linking.patch?rev=1.1&content-type=text/plain
Index: flphoto-1.3.1-linking.patch
===================================================================
diff --git a/Makefile.in b/Makefile.in
index 76703be..0dddba1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,7 @@ EXEEXT = @EXEEXT@
CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OPTIM)
CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ $(OPTIM)
-LDFLAGS = @LDFLAGS@ $(OPTIM)
+LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
OPTIM = @OPTIM@ @DEFS@
@@ -85,16 +85,13 @@ VPATH = $(srcdir)
# Rules...
#
-.SILENT:
.SUFFIXES: .c .cxx .h .mo .o .po
.c.o:
- echo Compiling $<...
$(CC) $(CFLAGS) -I. -I$(srcdir) -c $<
.cxx.o:
- echo Compiling $<...
$(CXX) $(CXXFLAGS) -I. -I$(srcdir) -c $<
-.po: espmsg$(EXEEXT)
+.po: espmsg$(EXEEXT)
echo Generating $@...
./espmsg $< compile
@@ -108,8 +105,7 @@ TARGETS = \
fldcraw$(EXEEXT) \
flphoto$(EXEEXT) \
espmsg$(EXEEXT) \
- testexif$(EXEEXT) \
- $(TRANSLATIONS)
+ testexif$(EXEEXT)
CFILES = \
espmsglib.c \
i18n.c \
@@ -154,6 +150,7 @@ OBJS = $(CFILES:.c=.o) $(CXXFILES:.cxx=.o)
all: Makefile config.h $(TARGETS) testslideshow
+translations: $(TRANSLATIONS)
#
# Clean all object files...
@@ -210,6 +207,8 @@ install: $(TARGETS) @INSTALLDESKTOP@
$(CP) $(srcdir)/doc/*.jpg $(DESTDIR)$(docdir)
$(RM) $(DESTDIR)$(docdir)/*.png
$(CP) $(srcdir)/doc/*.png $(DESTDIR)$(docdir)
+
+install-translations: translations
echo Installing flphoto translations in $(DESTDIR)$(FLPHOTO_LOCALE)
-$(MKDIR) $(DESTDIR)$(FLPHOTO_LOCALE)
for file in $(TRANSLATIONS); do \
@@ -221,9 +220,9 @@ install: $(TARGETS) @INSTALLDESKTOP@
install-desktop:
echo Installing flPhoto desktop files...
- -$(MKDIR) $(DESTDIR)/etc/X11/applnk/Graphics
- $(RM) $(DESTDIR)/etc/X11/applnk/Graphics/flphoto.desktop
- $(CP) flphoto.desktop $(DESTDIR)/etc/X11/applnk/Graphics
+ -$(MKDIR) $(DESTDIR)/usr/share/applications
+ $(RM) $(DESTDIR)/usr/share/applications/flphoto.desktop
+ $(CP) flphoto.desktop $(DESTDIR)/usr/share/applications
-$(MKDIR) $(DESTDIR)/usr/share/pixmaps
$(RM) $(DESTDIR)/usr/share/pixmaps/flphoto.png
$(CP) doc/flphoto.png $(DESTDIR)/usr/share/pixmaps
@@ -255,7 +254,7 @@ uninstall: @UNINSTALLDESKTOP@
uninstall-desktop:
echo Removing flPhoto desktop files...
- $(RM) $(DESTDIR)/etc/X11/applnk/Graphics/flphoto.desktop
+ $(RM) $(DESTDIR)/usr/share/applications/flphoto.desktop
$(RM) $(DESTDIR)/usr/share/pixmaps/flphoto.png
$(RM) $(DESTDIR)/usr/share/mimelnk/application/x-flphoto.desktop
@@ -318,8 +317,8 @@ po/flphoto.pot: $(CFILES) $(CXXFILES) espmsg$(EXEEXT)
#
fldcraw$(EXEEXT): fldcraw.c
- echo Compiling and linking fldcraw$(EXEEXT)...
- $(CC) $(CFLAGS) -DNO_JPEG -DNO_LCMS -o fldcraw$(EXEEXT) fldcraw.c -lm
+ $(CC) $(CFLAGS) -DNO_JPEG -DNO_LCMS -c fldcraw.c
+ $(CC) $(CFLAGS) $(LDFLAGS) -o fldcraw$(EXEEXT) fldcraw.o -lm
#
@@ -327,8 +326,7 @@ fldcraw$(EXEEXT): fldcraw.c
#
flphoto$(EXEEXT): $(OBJS)
- echo Linking flphoto$(EXEEXT)...
- $(CXX) $(CXXFLAGS) -o flphoto$(EXEEXT) $(OBJS) $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o flphoto$(EXEEXT) $(OBJS) $(LIBS)
#
@@ -336,8 +334,7 @@ flphoto$(EXEEXT): $(OBJS)
#
espmsg$(EXEEXT): espmsg.o espmsglib.o
- echo Linking espmsg$(EXEEXT)...
- $(CC) $(CFLAGS) -o espmsg$(EXEEXT) espmsg.o espmsglib.o $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o espmsg$(EXEEXT) espmsg.o espmsglib.o $(LIBS)
#
@@ -345,8 +342,7 @@ espmsg$(EXEEXT): espmsg.o espmsglib.o
#
testexif$(EXEEXT): testexif.o Fl_EXIF_Data.o
- echo Linking testexif$(EXEEXT)...
- $(CXX) $(CXXFLAGS) -o testexif$(EXEEXT) testexif.o Fl_EXIF_Data.o $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o testexif$(EXEEXT) testexif.o Fl_EXIF_Data.o $(LIBS)
#
@@ -359,8 +355,7 @@ TSSOBJS = \
testslideshow.o
testslideshow$(EXEEXT): $(TSSOBJS)
- echo Linking $@...
- $(CXX) -o $@ $(TSSOBJS) $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(TSSOBJS) $(LIBS)
$(TSSOBJS): Compositor.h Fl_Slideshow.h
diff --git a/configure.in b/configure.in
index 07279a0..60b5c66 100644
--- a/configure.in
+++ b/configure.in
@@ -47,14 +47,14 @@ CFLAGS="${CFLAGS:=}"
CXXFLAGS="${CXXFLAGS:=}"
LDFLAGS="${LDFLAGS:=}"
AC_SUBST(LDFLAGS)
-OPTIM="-O"
+OPTIM=""
AC_SUBST(OPTIM)
AC_ARG_ENABLE(debug, [ --enable-debug turn on debugging [default=no]],
if eval "test x$enable_debug = xyes"; then
OPTIM="-g"
else
- LDFLAGS="$LDFLAGS -s"
+ LDFLAGS="$LDFLAGS"
fi)
AC_ARG_WITH(docdir, [ --with-docdir set directory for documentation],
@@ -166,11 +166,6 @@ fi
dnl Update compiler options...
if test -n "$GCC"; then
- if test -z "$OPTIM"; then
- OPTIM="-Os"
- fi
-
- OPTIM="-Wall -Wno-return-type $OPTIM"
# See if GCC supports -fno-rtti...
AC_MSG_CHECKING(if GCC supports -fno-rtti)
@@ -339,7 +334,7 @@ AC_SUBST(MAN5EXT)
dnl See if we have the X11 desktop stuff used by GNOME and KDE...
AC_MSG_CHECKING(if GNOME/KDE desktop is in use)
-if test -d /etc/X11/applnk; then
+if test -d /usr/share/applications; then
AC_MSG_RESULT(yes)
INSTALLDESKTOP="install-desktop"
UNINSTALLDESKTOP="uninstall-desktop"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-06 12:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-06 12:41 [gentoo-commits] gentoo-x86 commit in media-gfx/flphoto/files: flphoto-1.3.1-linking.patch Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox