rpms/malaga/devel malaga-7.11-link-against-libmalaga.patch, NONE, 1.1 malaga.spec, 1.2, 1.3
Ville-Pekka Vainio (vpv)
fedora-extras-commits at redhat.com
Sat Feb 23 09:59:28 UTC 2008
- Previous message (by thread): rpms/gdesklets/devel .cvsignore, 1.5, 1.6 gdesklets.spec, 1.35, 1.36 sources, 1.5, 1.6 transition.patch, 1.3, 1.4
- Next message (by thread): rpms/thewidgetfactory/devel thewidgetfactory.spec,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: vpv
Update of /cvs/pkgs/rpms/malaga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17299
Modified Files:
malaga.spec
Added Files:
malaga-7.11-link-against-libmalaga.patch
Log Message:
Add patch
malaga-7.11-link-against-libmalaga.patch:
--- NEW FILE malaga-7.11-link-against-libmalaga.patch ---
--- malaga-7.11/Makefile.in 2007-07-09 21:30:58.000000000 +0300
+++ malaga-7.11.new/Makefile.in 2008-02-22 20:30:35.000000000 +0200
@@ -78,11 +78,11 @@
.c.o:
@echo "Compiling $<"
- @$(COMPILE) $(GLIB_CFLAGS) $(READLINE_CFLAGS) $<
+ $(COMPILE) $(GLIB_CFLAGS) $(READLINE_CFLAGS) $<
# Primary goals. --------------------------------------------------------------
-all: malaga.h malaga.el $(MALAGA_BIN) libmalaga.la
+all: malaga.h malaga.el libmalaga.la $(MALAGA_BIN)
clean:
rm -rf *.o *.lo *.tgz libmalaga.la $(MALAGA_BIN) maldump .libs \
@@ -202,85 +202,75 @@
$(LIBMALAGA_OBJS):
@echo "Compiling $<"
- @$(LIBTOOL) --mode=compile $(COMPILE) $(GLIB_CFLAGS) $(srcdir)/$*.c
+ $(LIBTOOL) --mode=compile $(COMPILE) $(GLIB_CFLAGS) $(srcdir)/$*.c
libmalaga.la: $(LIBMALAGA_OBJS)
@echo "Linking libmalaga"
- @$(LIBTOOL) --mode=link $(LINK) $(LIBMALAGA_OBJS:.o=.lo) $(GLIB_LIBS) \
+ $(LIBTOOL) --mode=link $(LINK) $(LIBMALAGA_OBJS:.o=.lo) $(GLIB_LIBS) \
-lm -o libmalaga.la -version-info $(LIBMALAGA_VERSION) \
-rpath @libdir@
# malaga ----------------------------------------------------------------------
-MALAGA_OBJS = $(COMMON_OBJS) commands_interactive.o breakpoints.o debugger.o \
- generation.o malaga.o
+MALAGA_OBJS = commands_interactive.o breakpoints.o debugger.o generation.o \
+ malaga.o
-malaga: $(MALAGA_OBJS)
+malaga: $(MALAGA_OBJS) libmalaga.la
@echo "Linking malaga"
- @$(LINK) $(MALAGA_OBJS) $(GLIB_LIBS) $(READLINE_LIBS) -lm -o malaga
+ $(LINK) $(MALAGA_OBJS) $(GLIB_LIBS) $(READLINE_LIBS) -lm -L./.libs \
+ -lmalaga -o malaga
# maldump ---------------------------------------------------------------------
-MALDUMP_OBJS = basic.o files.o hangul.o malaga_files.o maldump.o patterns.o \
- pools.o rules.o symbols.o tries.o values.o
-
-maldump: $(MALDUMP_OBJS)
+maldump: maldump.o libmalaga.la
@echo "Linking maldump"
- @$(LINK) $(MALDUMP_OBJS) $(GLIB_LIBS) -lm -o maldump
+ $(LINK) maldump.o $(GLIB_LIBS) -lm -L./.libs -lmalaga -o maldump
# mallex ----------------------------------------------------------------------
-MALLEX_OBJS = avl_trees.o basic.o breakpoints.o commands.o \
- commands_interactive.o debugger.o display.o files.o hangul.o \
- input.o lex_compiler.o malaga_files.o mallex.o options.o \
- patterns.o pools.o processes.o rules.o scanner.o symbols.o \
- transmit.o tries.o value_parser.o values.o
+MALLEX_OBJS = breakpoints.o commands_interactive.o debugger.o lex_compiler.o \
+ mallex.o
-mallex: $(MALLEX_OBJS)
+mallex: $(MALLEX_OBJS) libmalaga.la
@echo "Linking mallex"
- @$(LINK) $(MALLEX_OBJS) $(GLIB_LIBS) $(READLINE_LIBS) -lm -o mallex
+ $(LINK) $(MALLEX_OBJS) $(GLIB_LIBS) $(READLINE_LIBS) -lm -L./.libs \
+ -lmalaga -o mallex
# malmake ---------------------------------------------------------------------
-MALMAKE_OBJS = basic.o files.o input.o malmake.o
-
-malmake: $(MALMAKE_OBJS)
+malmake: malmake.o libmalaga.la
@echo "Linking malmake"
- @$(LINK) $(MALMAKE_OBJS) $(GLIB_LIBS) -o malmake
+ $(LINK) malmake.o $(GLIB_LIBS) -L./.libs -lmalaga -o malmake
# malrul ----------------------------------------------------------------------
-MALRUL_OBJS = avl_trees.o basic.o files.o hangul.o malaga_files.o malrul.o \
- patterns.o pools.o rule_code.o rule_compiler.o rule_parser.o \
- rule_symbols.o scanner.o symbols.o tries.o values.o
+MALRUL_OBJS = malrul.o rule_code.o rule_compiler.o rule_parser.o \
+ rule_symbols.o
-malrul: $(MALRUL_OBJS)
+malrul: $(MALRUL_OBJS) libmalaga.la
@echo "Linking malrul"
- @$(LINK) $(MALRUL_OBJS) $(GLIB_LIBS) -o malrul
+ $(LINK) $(MALRUL_OBJS) $(GLIB_LIBS) -L./.libs -lmalaga -o malrul
# malshow ---------------------------------------------------------------------
-GTK_OBJS = allomorphs.o canvas.o expressions.o malshow.o result.o tree.o \
- variables.o
-
-MALSHOW_OBJS = $(GTK_OBJS) basic.o files.o input.o scanner.o
+MALSHOW_OBJS = allomorphs.o canvas.o expressions.o malshow.o result.o tree.o \
+ variables.o
-$(GTK_OBJS):
+$(MALSHOW_OBJS):
@echo "Compiling $<"
- @$(COMPILE) $(GTK_CFLAGS) $(srcdir)/$*.c
+ $(COMPILE) $(GTK_CFLAGS) $(srcdir)/$*.c
-malshow: $(MALSHOW_OBJS)
+malshow: $(MALSHOW_OBJS) libmalaga.la
@echo "Linking malshow"
- @$(LINK) $(MALSHOW_OBJS) $(GTK_LIBS) -o malshow
+ $(LINK) $(MALSHOW_OBJS) $(GTK_LIBS) -L./.libs -lmalaga -o malshow
# malsym ----------------------------------------------------------------------
-MALSYM_OBJS = avl_trees.o basic.o files.o hangul.o malaga_files.o malsym.o \
- pools.o scanner.o sym_compiler.o symbols.o tries.o values.o
+MALSYM_OBJS = malsym.o sym_compiler.o
-malsym: $(MALSYM_OBJS)
+malsym: $(MALSYM_OBJS) libmalaga.la
@echo "Linking malsym"
- @$(LINK) $(MALSYM_OBJS) $(GLIB_LIBS) -o malsym
+ $(LINK) $(MALSYM_OBJS) $(GLIB_LIBS) -L./.libs -lmalaga -o malsym
#==============================================================================
# The dependencies are created by "gcc -MM *.c `pkg-config gtk+-2.0 --cflags`.
Index: malaga.spec
===================================================================
RCS file: /cvs/pkgs/rpms/malaga/devel/malaga.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- malaga.spec 15 Feb 2008 23:02:33 -0000 1.2
+++ malaga.spec 23 Feb 2008 09:58:52 -0000 1.3
@@ -1,12 +1,13 @@
Name: malaga
Version: 7.11
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A programming language for automatic language analysis
Group: Development/Languages
License: GPLv2+
URL: http://home.arcor.de/bjoern-beutel/malaga/
Source0: http://home.arcor.de/bjoern-beutel/malaga/%{name}-%{version}.tgz
+Patch0: malaga-7.11-link-against-libmalaga.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel readline-devel
@@ -44,10 +45,9 @@
%prep
%setup -q
+%patch0 -p1
# Remove "-s" so binaries won't be stripped
sed -i.strip -e 's| -s | |' Makefile.in
-# Remove "@" marks so that the build process is more verbose
-sed -i.debug -e 's|^\([ \t][ \t]*\)@|\1|' Makefile.in
# Make libtool output more verbose
sed -i.silent -e 's|--silent||' Makefile.in
@@ -103,6 +103,9 @@
%changelog
+* Sat Feb 23 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 7.11-3
+- Add Makefile.in patch to link the executables against libmalaga
+
* Sat Feb 16 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> 7.11-2
- Rebuild for GCC 4.3
- Previous message (by thread): rpms/gdesklets/devel .cvsignore, 1.5, 1.6 gdesklets.spec, 1.35, 1.36 sources, 1.5, 1.6 transition.patch, 1.3, 1.4
- Next message (by thread): rpms/thewidgetfactory/devel thewidgetfactory.spec,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list