~ubuntu-branches/ubuntu/maverick/radare/maverick

« back to all changes in this revision

Viewing changes to src/rasm/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): SevenMachines
  • Date: 2010-09-07 15:44:27 UTC
  • mfrom: (1.1.3 upstream) (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100907154427-37u92vu12tqabqqz
Tags: 1:1.5.2-3ubuntu1
* Merge from debian testing (LP: #621016)
* debian/control:
     + libvala-dev transition to libval-0.10-dev (LP: #618809) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
include ../../config.mk
2
2
 
3
 
OBJ=rasm.o x86.o arm.o java.o ppc.o main.o ../w32utils.o olly.o rsc.o
 
3
OBJ=rasm.o x86.o arm.o java.o ppc.o main.o olly.o nasm.o rsc.o ../w32utils.o
4
4
OLLYOBJ=../arch/x86/ollyasm/assembl.o
5
5
OLLYOBJ+=../arch/x86/ollyasm/asmserv.o
6
6
OLLYOBJ+=../arch/x86/ollyasm/disasm.o