gwj / at91sam9263 · Commits

Commit a8e492c07f31799a5e5b7032659953a303fd778f

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent c9e0df73

Rename OBJS to obj-y 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 102 additions and 104 deletions
Makefile.target
  View file @a8e492c
... ... @@ -324,28 +324,28 @@ LDFLAGS+=-p
324 324 CFLAGS+=-p
325 325 endif
326 326  
327   -OBJS= main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \
  327 +obj-y = main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \
328 328 elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o
329 329 LIBS+= $(PTHREADLIBS)
330 330 LIBS+= $(CLOCKLIBS)
331 331 ifdef TARGET_HAS_BFLT
332   -OBJS+= flatload.o
  332 +obj-y += flatload.o
333 333 endif
334 334 ifdef TARGET_HAS_ELFLOAD32
335   -OBJS+= elfload32.o
  335 +obj-y += elfload32.o
336 336 elfload32.o: elfload.c
337 337 endif
338 338  
339 339 ifeq ($(TARGET_ARCH), i386)
340   -OBJS+= vm86.o
  340 +obj-y += vm86.o
341 341 endif
342 342 ifeq ($(TARGET_ARCH), arm)
343   -OBJS+=nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \
  343 +obj-y += nwfpe/fpa11.o nwfpe/fpa11_cpdo.o \
344 344 nwfpe/fpa11_cpdt.o nwfpe/fpa11_cprt.o nwfpe/fpopcode.o nwfpe/single_cpdo.o \
345 345 nwfpe/double_cpdo.o nwfpe/extended_cpdo.o arm-semi.o
346 346 endif
347 347 ifeq ($(TARGET_ARCH), m68k)
348   -OBJS+= m68k-sim.o m68k-semi.o
  348 +obj-y += m68k-sim.o m68k-semi.o
349 349 endif
350 350  
351 351 # Note: this is a workaround. The real fix is to avoid compiling
... ... @@ -353,8 +353,8 @@ endif
353 353 signal.o: CFLAGS += $(HELPER_CFLAGS)
354 354  
355 355 $(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a
356   -$(QEMU_PROG): $(OBJS) ../libqemu_user.a libqemu.a
357   - $(call LINK,$(OBJS))
  356 +$(QEMU_PROG): $(obj-y) ../libqemu_user.a libqemu.a
  357 + $(call LINK,$(obj-y))
358 358 ifeq ($(ARCH),alpha)
359 359 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
360 360 # the address space (31 bit so sign extending doesn't matter)
... ... @@ -376,16 +376,16 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000
376 376  
377 377 LIBS+=-lmx
378 378  
379   -OBJS= main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
380   - gdbstub.o gdbstub-xml.o
  379 +obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \
  380 + gdbstub.o gdbstub-xml.o
381 381  
382 382 # Note: this is a workaround. The real fix is to avoid compiling
383 383 # cpu_signal_handler() in cpu-exec.c.
384 384 signal.o: CFLAGS += $(HELPER_CFLAGS)
385 385  
386 386 $(QEMU_PROG): ARLIBS=libqemu.a
387   -$(QEMU_PROG): $(OBJS) libqemu.a
388   - $(call LINK,$(OBJS))
  387 +$(QEMU_PROG): $(obj-y) libqemu.a
  388 + $(call LINK,$(obj-y))
389 389  
390 390 endif #CONFIG_DARWIN_USER
391 391  
... ... @@ -475,17 +475,17 @@ LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld
475 475 endif
476 476 endif
477 477  
478   -OBJS= main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \
479   - gdbstub.o gdbstub-xml.o
480   -OBJS+= uaccess.o
  478 +obj-y = main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \
  479 + gdbstub.o gdbstub-xml.o
  480 +obj-y += uaccess.o
481 481  
482 482 # Note: this is a workaround. The real fix is to avoid compiling
483 483 # cpu_signal_handler() in cpu-exec.c.
484 484 signal.o: CFLAGS += $(HELPER_CFLAGS)
485 485  
486 486 $(QEMU_PROG): ARLIBS=libqemu.a ../libqemu_user.a
487   -$(QEMU_PROG): $(OBJS) libqemu.a ../libqemu_user.a
488   - $(call LINK,$(OBJS))
  487 +$(QEMU_PROG): $(obj-y) libqemu.a ../libqemu_user.a
  488 + $(call LINK,$(obj-y))
489 489  
490 490 endif #CONFIG_BSD_USER
491 491  
... ... @@ -493,14 +493,12 @@ endif #CONFIG_BSD_USER
493 493 # System emulator target
494 494 ifndef CONFIG_USER_ONLY
495 495  
496   -OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \
497   - gdbstub.o gdbstub-xml.o msix.o
  496 +obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \
  497 + gdbstub.o gdbstub-xml.o msix.o
498 498 # virtio has to be here due to weird dependency between PCI and virtio-net.
499 499 # need to fix this properly
500   -OBJS+=virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
501   -ifdef CONFIG_KVM
502   -OBJS+=kvm.o kvm-all.o
503   -endif
  500 +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
  501 +obj-$(CONFIG_KVM) += kvm.o kvm-all.o
504 502  
505 503 LIBS+=-lz
506 504 ifdef CONFIG_ALSA
... ... @@ -551,140 +549,140 @@ endif
551 549 # xen backend driver support
552 550 XEN_OBJS := xen_machine_pv.o xen_domainbuild.o
553 551 ifeq ($(CONFIG_XEN), yes)
554   - OBJS += $(XEN_OBJS)
  552 + obj-y += $(XEN_OBJS)
555 553 LIBS += $(XEN_LIBS)
556 554 endif
557 555  
558 556 # USB layer
559   -OBJS+= usb-ohci.o
  557 +obj-y += usb-ohci.o
560 558  
561 559 # PCI network cards
562   -OBJS += eepro100.o
563   -OBJS += ne2000.o
564   -OBJS += pcnet.o
565   -OBJS += rtl8139.o
566   -OBJS += e1000.o
  560 +obj-y += eepro100.o
  561 +obj-y += ne2000.o
  562 +obj-y += pcnet.o
  563 +obj-y += rtl8139.o
  564 +obj-y += e1000.o
567 565  
568 566 # Generic watchdog support and some watchdog devices
569   -OBJS += wdt_ib700.o wdt_i6300esb.o
  567 +obj-y += wdt_ib700.o wdt_i6300esb.o
570 568  
571 569 ifeq ($(TARGET_BASE_ARCH), i386)
572 570 # Hardware support
573   -OBJS+= ide.o pckbd.o vga.o $(SOUND_HW) dma.o
574   -OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
575   -OBJS+= cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
576   -OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
577   -OBJS += device-hotplug.o pci-hotplug.o smbios.o
  571 +obj-y += ide.o pckbd.o vga.o $(SOUND_HW) dma.o
  572 +obj-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
  573 +obj-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o
  574 +obj-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
  575 +obj-y += device-hotplug.o pci-hotplug.o smbios.o
578 576 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
579 577 endif
580 578 ifeq ($(TARGET_BASE_ARCH), ppc)
581 579 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
582 580 # shared objects
583   -OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o
  581 +obj-y += ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o
584 582 # PREP target
585   -OBJS+= pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
586   -OBJS+= prep_pci.o ppc_prep.o
  583 +obj-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o
  584 +obj-y += prep_pci.o ppc_prep.o
587 585 # Mac shared devices
588   -OBJS+= macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o
  586 +obj-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o
589 587 # OldWorld PowerMac
590   -OBJS+= heathrow_pic.o grackle_pci.o ppc_oldworld.o
  588 +obj-y += heathrow_pic.o grackle_pci.o ppc_oldworld.o
591 589 # NewWorld PowerMac
592   -OBJS+= unin_pci.o ppc_newworld.o
  590 +obj-y += unin_pci.o ppc_newworld.o
593 591 # PowerPC 4xx boards
594   -OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
595   -OBJS+= ppc440.o ppc440_bamboo.o
  592 +obj-y += pflash_cfi02.o ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
  593 +obj-y += ppc440.o ppc440_bamboo.o
596 594 # PowerPC E500 boards
597   -OBJS+= ppce500_pci.o ppce500_mpc8544ds.o
  595 +obj-y += ppce500_pci.o ppce500_mpc8544ds.o
598 596 ifdef FDT_LIBS
599   -OBJS+= device_tree.o
  597 +obj-y += device_tree.o
600 598 LIBS+= $(FDT_LIBS)
601 599 endif
602 600 ifdef CONFIG_KVM
603   -OBJS+= kvm_ppc.o
  601 +obj-y += kvm_ppc.o
604 602 endif
605 603 endif
606 604 ifeq ($(TARGET_BASE_ARCH), mips)
607   -OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
608   -OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
609   -OBJS+= g364fb.o jazz_led.o dp8393x.o
610   -OBJS+= ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
611   -OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)
612   -OBJS+= mipsnet.o
613   -OBJS+= pflash_cfi01.o
614   -OBJS+= vmware_vga.o
  605 +obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
  606 +obj-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
  607 +obj-y += g364fb.o jazz_led.o dp8393x.o
  608 +obj-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
  609 +obj-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)
  610 +obj-y += mipsnet.o
  611 +obj-y += pflash_cfi01.o
  612 +obj-y += vmware_vga.o
615 613 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
616 614 endif
617 615 ifeq ($(TARGET_BASE_ARCH), microblaze)
618   -OBJS+= petalogix_s3adsp1800_mmu.o
  616 +obj-y += petalogix_s3adsp1800_mmu.o
619 617  
620   -OBJS+= microblaze_pic_cpu.o
621   -OBJS+= xilinx_intc.o
622   -OBJS+= xilinx_timer.o
623   -OBJS+= xilinx_uartlite.o
624   -OBJS+= xilinx_ethlite.o
  618 +obj-y += microblaze_pic_cpu.o
  619 +obj-y += xilinx_intc.o
  620 +obj-y += xilinx_timer.o
  621 +obj-y += xilinx_uartlite.o
  622 +obj-y += xilinx_ethlite.o
625 623  
626   -OBJS+= pflash_cfi02.o
  624 +obj-y += pflash_cfi02.o
627 625 ifdef FDT_LIBS
628   -OBJS+= device_tree.o
  626 +obj-y += device_tree.o
629 627 LIBS+= $(FDT_LIBS)
630 628 endif
631 629 endif
632 630 ifeq ($(TARGET_BASE_ARCH), cris)
633 631 # Boards
634   -OBJS+= cris_pic_cpu.o etraxfs.o axis_dev88.o
  632 +obj-y += cris_pic_cpu.o etraxfs.o axis_dev88.o
635 633  
636 634 # IO blocks
637   -OBJS+= etraxfs_dma.o
638   -OBJS+= etraxfs_pic.o
639   -OBJS+= etraxfs_eth.o
640   -OBJS+= etraxfs_timer.o
641   -OBJS+= etraxfs_ser.o
  635 +obj-y += etraxfs_dma.o
  636 +obj-y += etraxfs_pic.o
  637 +obj-y += etraxfs_eth.o
  638 +obj-y += etraxfs_timer.o
  639 +obj-y += etraxfs_ser.o
642 640  
643   -OBJS+= pflash_cfi02.o
  641 +obj-y += pflash_cfi02.o
644 642 endif
645 643 ifeq ($(TARGET_BASE_ARCH), sparc)
646 644 ifeq ($(TARGET_ARCH), sparc64)
647   -OBJS+= sun4u.o ide.o pckbd.o vga.o apb_pci.o
648   -OBJS+= fdc.o mc146818rtc.o serial.o
649   -OBJS+= cirrus_vga.o parallel.o
  645 +obj-y += sun4u.o ide.o pckbd.o vga.o apb_pci.o
  646 +obj-y += fdc.o mc146818rtc.o serial.o
  647 +obj-y += cirrus_vga.o parallel.o
650 648 else
651   -OBJS+= sun4m.o tcx.o iommu.o slavio_intctl.o
652   -OBJS+= slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o
653   -OBJS+= cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
  649 +obj-y += sun4m.o tcx.o iommu.o slavio_intctl.o
  650 +obj-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o
  651 +obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
654 652 endif
655 653 endif
656 654 ifeq ($(TARGET_BASE_ARCH), arm)
657   -OBJS+= integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o
658   -OBJS+= arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
659   -OBJS+= versatile_pci.o
660   -OBJS+= realview_gic.o realview.o arm_sysctl.o mpcore.o
661   -OBJS+= armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
662   -OBJS+= pl061.o
663   -OBJS+= arm-semi.o
664   -OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
665   -OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
666   -OBJS+= pflash_cfi01.o gumstix.o
667   -OBJS+= zaurus.o ide.o serial.o spitz.o tosa.o tc6393xb.o
668   -OBJS+= omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o
669   -OBJS+= omap2.o omap_dss.o soc_dma.o
670   -OBJS+= omap_sx1.o palm.o tsc210x.o
671   -OBJS+= nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
672   -OBJS+= mst_fpga.o mainstone.o
673   -OBJS+= musicpal.o pflash_cfi02.o
674   -OBJS+= framebuffer.o
675   -OBJS+= syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
676   -OBJS+= syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
677   -OBJS+= syborg_virtio.o
  655 +obj-y += integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o
  656 +obj-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o
  657 +obj-y += versatile_pci.o
  658 +obj-y += realview_gic.o realview.o arm_sysctl.o mpcore.o
  659 +obj-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
  660 +obj-y += pl061.o
  661 +obj-y += arm-semi.o
  662 +obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o
  663 +obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
  664 +obj-y += pflash_cfi01.o gumstix.o
  665 +obj-y += zaurus.o ide.o serial.o spitz.o tosa.o tc6393xb.o
  666 +obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o
  667 +obj-y += omap2.o omap_dss.o soc_dma.o
  668 +obj-y += omap_sx1.o palm.o tsc210x.o
  669 +obj-y += nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o
  670 +obj-y += mst_fpga.o mainstone.o
  671 +obj-y += musicpal.o pflash_cfi02.o
  672 +obj-y += framebuffer.o
  673 +obj-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
  674 +obj-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o
  675 +obj-y += syborg_virtio.o
678 676 CPPFLAGS += -DHAS_AUDIO
679 677 endif
680 678 ifeq ($(TARGET_BASE_ARCH), sh4)
681   -OBJS+= shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
682   -OBJS+= sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o
683   -OBJS+= ide.o
  679 +obj-y += shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o
  680 +obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o
  681 +obj-y += ide.o
684 682 endif
685 683 ifeq ($(TARGET_BASE_ARCH), m68k)
686   -OBJS+= an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
687   -OBJS+= m68k-semi.o dummy_m68k.o
  684 +obj-y += an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o
  685 +obj-y += m68k-semi.o dummy_m68k.o
688 686 endif
689 687 ifdef CONFIG_COCOA
690 688 COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit
... ... @@ -738,8 +736,8 @@ monitor.o: qemu-monitor.h
738 736  
739 737 $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS)
740 738 $(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
741   -$(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB)
742   - $(call LINK,$(OBJS))
  739 +$(QEMU_PROG): $(obj-y) ../libqemu_common.a libqemu.a $(HWLIB)
  740 + $(call LINK,$(obj-y))
743 741  
744 742 endif # !CONFIG_USER_ONLY
745 743  
... ...