[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ``make dist'' and friends
|
From: |
Barry deFreese |
|
Subject: |
Re: ``make dist'' and friends |
|
Date: |
Wed, 29 Nov 2006 00:30:13 -0500 |
|
User-agent: |
Thunderbird 1.5.0.8 (Windows/20061025) |
Barry deFreese wrote:
Thomas Schwinge wrote:
Hello!
On Tue, Nov 28, 2006 at 12:13:20AM -0500, Barry deFreese wrote:
Barry deFreese wrote:
[...] I have added a few dist_libkernel_a_SOURCE to include all the
header files, .sym, .srv, and .cli files.
That seems to be correct. I hope that doing so doesn't break anything.
(Thinking about the rules in `Makerules.am' that deal with those files.)
But you should have noticed if it had...
Now I am stuck on one that I cannot figure out:
< i386/i386/lib_dep_tr_for_defs_a-mach_i386.server.defs.o
make[2]: *** No rule to make target `i386/i386/i386asm.h', needed
by `../ipc/ipc_entry.c'. Stop.
Probably some of its dependency files are still missing to be added to
some `*_SOURCE' variable, have a look at the first set of rules in
`Makerules.am'.
A small update. Apparently
i386/i386/lib_dep_tr_for_defs_a-mach_i386.server.defs.o isn't
getting built but I get no error...
But it's definitely needed, as I understand this at the moment. (I
can't
access a built tree at the moment.)
Regards,
Thomas
OK gang, I've gotten pretty far but now I'm a little confused. I had
to include linux/src/drivers/scsi/FlashPoint.c because BusLogic.c
includes. But now it is attempting to build FlashPoint.c and failing.
gcc -nostdinc -imacros config.h -Ii386 -I. -I../i386
-I../i386/include/mach/sa -I../include -D__ASSEMBLY__ -traditional
-nostdinc -imacros config.h -Ii386 -I. -I../i386
-I../i386/include/mach/sa -I../include -I../i386/linux/dev/include
-I./linux/dev/include -I../linux/dev/include -I./linux/src/include
-I../linux/src/include -g -O2 -c -o
linux/src/arch/i386/lib/liblinux_a-semaphore.o `test -f
'linux/src/arch/i386/lib/semaphore.S' || echo
'../'`linux/src/arch/i386/lib/semaphore.S
if gcc -DHAVE_CONFIG_H -I. -I.. -I. -nostdinc -imacros config.h
-Ii386 -I. -I../i386 -I../i386/include/mach/sa -I../include
-I../i386/linux/dev/include -I./linux/dev/include
-I../linux/dev/include -I./linux/src/include -I../linux/src/include
-O2 -Wall -fno-strict-aliasing -g -O2 -MT
linux/src/drivers/scsi/liblinux_a-FlashPoint.o -MD -MP -MF
"linux/src/drivers/scsi/.deps/liblinux_a-FlashPoint.Tpo" -c -o
linux/src/drivers/scsi/liblinux_a-FlashPoint.o `test -f
'linux/src/drivers/scsi/FlashPoint.c' || echo
'../'`linux/src/drivers/scsi/FlashPoint.c; \
then mv -f
"linux/src/drivers/scsi/.deps/liblinux_a-FlashPoint.Tpo"
"linux/src/drivers/scsi/.deps/liblinux_a-FlashPoint.Po"; else rm -f
"linux/src/drivers/scsi/.deps/liblinux_a-FlashPoint.Tpo"; exit 1; fi
../linux/src/drivers/scsi/FlashPoint.c: In function
'FlashPoint_ProbeHostAdapter':
../linux/src/drivers/scsi/FlashPoint.c:2432: warning: implicit
declaration of function 'inb'
../linux/src/drivers/scsi/FlashPoint.c:2467: warning: implicit
declaration of function 'outb'
../linux/src/drivers/scsi/FlashPoint.c: In function
'FlashPoint_ReleaseHostAdapter':
../linux/src/drivers/scsi/FlashPoint.c:4106: warning: implicit
declaration of function 'outl'
../linux/src/drivers/scsi/FlashPoint.c: In function 'FPT_RNVRamData':
../linux/src/drivers/scsi/FlashPoint.c:4146: warning: implicit
declaration of function 'inl'
../linux/src/drivers/scsi/FlashPoint.c: In function
'FlashPoint_HandleInterrupt':
../linux/src/drivers/scsi/FlashPoint.c:4713: warning: implicit
declaration of function 'inw'
../linux/src/drivers/scsi/FlashPoint.c:4730: warning: implicit
declaration of function 'outw'
../linux/src/drivers/scsi/FlashPoint.c: At top level:
../linux/src/drivers/scsi/FlashPoint.c:12056: error: expected ')'
before '*' token
../linux/src/drivers/scsi/FlashPoint.c:12063: error: expected '=',
',', ';', 'asm' or '__attribute__' before
'FlashPoint__HardwareResetHostAdapter'
../linux/src/drivers/scsi/FlashPoint.c:12069: error: expected ')'
before 'CardHandle'
../linux/src/drivers/scsi/FlashPoint.c:12076: error: expected ')'
before 'CardHandle'
../linux/src/drivers/scsi/FlashPoint.c:12083: error: expected ')'
before 'CardHandle'
../linux/src/drivers/scsi/FlashPoint.c:12090: error: expected '=',
',', ';', 'asm' or '__attribute__' before 'FlashPoint__InterruptPending'
../linux/src/drivers/scsi/FlashPoint.c:12097: error: expected ')'
before 'CardHandle'
../linux/src/drivers/scsi/FlashPoint.c:12117: error: expected ')'
before 'CardHandle'
make[2]: *** [linux/src/drivers/scsi/liblinux_a-FlashPoint.o] Error 1
rm i386/i386/i386asm.symc.o i386/i386/i386asm.symc
make[2]: Leaving directory `/tmp/gnumach-1.3.99/build'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/tmp/gnumach-1.3.99/build'
make: *** [all] Error 2
But afaict, in a normal (i.e. not from make dist's tarball),
FlashPoint.c is not build. I am attaching a diff of what I have done
so far.
Thanks!
Barry deFreese (aka bddebian)
Doh, forgot the .diff file. Also, I meant to mention. I suppose one
way around this may be to add FlashPoint.c to EXTRA_DIST instead of
inside of a dist_liblinux_a_SOURCES target?
Thanks again,
Barry
Index: Makefile.am
===================================================================
RCS file: /cvsroot/hurd/gnumach/Attic/Makefile.am,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 Makefile.am
--- Makefile.am 11 Nov 2006 17:28:05 -0000 1.1.2.2
+++ Makefile.am 29 Nov 2006 05:08:36 -0000
@@ -23,8 +23,13 @@
#
SUBDIRS =
-DIST_SUBDIRS =
-EXTRA_DIST =
+DIST_SUBDIRS =
+EXTRA_DIST = Makefile.correct_output_files_for_.S_files.patch \
+ ChangeLog.0 ChangeLog.00 DEVELOPMENT assigns \
+ gensym.awk include \
+ config.status.dep.patch linux/src/include \
+ linux/dev/include ipc/mach_port.srv \
+ i386/include i386/linux
noinst_LIBRARIES =
noinst_PROGRAMS =
TESTS=
@@ -35,6 +40,14 @@ AM_CCASFLAGS =
AM_CFLAGS =
AM_LDFLAGS =
+
+dist-hook:
+#delete all occurances of CVS dirs?
+# rm -rf `find $(distdir)/linux/src/include -name CVS`
+ rm -rf `find $(distdir)/ -name CVS`
+ rm -rf `find $(distdir)/linux/dev/include/asm`
+ rm -rf `find $(distdir)/linux/src/include/asm`
+
#
# Compilation flags
#
@@ -81,6 +94,7 @@ CPP = @CPP@ -x c
noinst_LIBRARIES += \
libkernel.a
libkernel_a_SOURCES =
+dist_libkernel_a_SOURCES =
nodist_libkernel_a_SOURCES =
MOSTLYCLEANFILES += \
$(nodist_libkernel_a_SOURCES)
Index: Makefrag.am
===================================================================
RCS file: /cvsroot/hurd/gnumach/Attic/Makefrag.am,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 Makefrag.am
--- Makefrag.am 8 Nov 2006 18:55:24 -0000 1.1.2.6
+++ Makefrag.am 29 Nov 2006 05:08:45 -0000
@@ -38,6 +38,24 @@ libkernel_a_SOURCES += \
ddb/db_variables.c \
ddb/db_watch.c \
ddb/db_write_cmd.c
+
+# Include headers in make dist.
+dist_libkernel_a_SOURCES += \
+ ddb/db_access.h \
+ ddb/db_break.h \
+ ddb/db_command.h \
+ ddb/db_expr.h \
+ ddb/db_lex.h \
+ ddb/db_output.h \
+ ddb/db_print.h \
+ ddb/db_run.h \
+ ddb/db_sym.h \
+ ddb/db_task_thread.h \
+ ddb/db_variables.h \
+ ddb/db_watch.h \
+ ddb/nlist.h \
+ ddb/stab.h \
+ ddb/tr.h
endif
# IPC implementation.
@@ -63,6 +81,30 @@ libkernel_a_SOURCES += \
ipc/mach_rpc.c \
ipc/mach_debug.c
+# Include headers in make dist.
+dist_libkernel_a_SOURCES += \
+ ipc/ipc_entry.h \
+ ipc/ipc_hash.h \
+ ipc/ipc_init.h \
+ ipc/ipc_kmsg.h \
+ ipc/ipc_kmsg_queue.h \
+ ipc/ipc_machdep.h \
+ ipc/ipc_marequest.h \
+ ipc/ipc_mqueue.h \
+ ipc/ipc_notify.h \
+ ipc/ipc_object.h \
+ ipc/ipc_port.h \
+ ipc/ipc_pset.h \
+ ipc/ipc_right.h \
+ ipc/ipc_space.h \
+ ipc/ipc_splay.h \
+ ipc/ipc_table.h \
+ ipc/ipc_target.h \
+ ipc/ipc_thread.h \
+ ipc/ipc_types.h \
+ ipc/mach_msg.h \
+ ipc/port.h
+
# "kernel" implementation (tasks, threads, trivia, etc.).
libkernel_a_SOURCES += \
kern/act.c \
@@ -106,6 +148,52 @@ libkernel_a_SOURCES += \
kern/elf-load.c \
kern/boot_script.c
+dist_libkernel_a_SOURCES += \
+ kern/act.h \
+ kern/assert.h \
+ kern/ast.h \
+ kern/boot_script.h \
+ kern/compat_xxx_defs.h \
+ kern/counters.h \
+ kern/cpu_number.h \
+ kern/debug.h \
+ kern/eventcount.h \
+ kern/host.h \
+ kern/ipc_host.h \
+ kern/ipc_kobject.h \
+ kern/ipc_sched.h \
+ kern/ipc_tt.h \
+ kern/kalloc.h \
+ kern/kern_types.h \
+ kern/lock.h \
+ kern/mach_clock.h \
+ kern/mach_factor.h \
+ kern/mach_param.h \
+ kern/macro_help.h \
+ kern/pc_sample.h \
+ kern/printf.h \
+ kern/processor.h \
+ kern/queue.h \
+ kern/refcount.h \
+ kern/sched.h \
+ kern/sched_prim.h \
+ kern/shuttle.h \
+ kern/syscall_emulation.h \
+ kern/syscall_subr.h \
+ kern/syscall_sw.h \
+ kern/task.h \
+ kern/thread.h \
+ kern/thread_swap.h \
+ kern/time_out.h \
+ kern/time_stamp.h \
+ kern/timer.h \
+ kern/xpr.h \
+ kern/zalloc.h \
+ kern/mach.srv \
+ kern/mach4.srv \
+ kern/mach_debug.srv \
+ kern/mach_host.srv
+
# Still more trivia.
libkernel_a_SOURCES += \
util/putchar.c \
@@ -125,6 +213,20 @@ libkernel_a_SOURCES += \
vm/vm_user.c \
vm/memory_object.c
+dist_libkernel_a_SOURCES += \
+ vm/memory_object.h \
+ vm/pmap.h \
+ vm/vm_external.h \
+ vm/vm_fault.h \
+ vm/vm_kern.h \
+ vm/vm_map.h \
+ vm/vm_object.h \
+ vm/vm_page.h \
+ vm/vm_pageout.h \
+ vm/vm_user.h \
+ vm/memory_object_default.cli \
+ vm/memory_object_user.cli
+
# These device support files are always needed; the others are needed only if
# particular drivers want the routines.
# TODO. Functions in device/subrs.c should each be moved elsewhere.
@@ -140,6 +242,29 @@ libkernel_a_SOURCES += \
device/blkio.c \
device/chario.c
+dist_libkernel_a_SOURCES += \
+ device/buf.h \
+ device/cirbuf.h \
+ device/conf.h \
+ device/cons.h \
+ device/dev_hdr.h \
+ device/dev_master.h \
+ device/device_port.h \
+ device/device_types_kernel.h \
+ device/ds_routines.h \
+ device/errno.h \
+ device/if_ether.h \
+ device/if_hdr.h \
+ device/io_req.h \
+ device/kmsg.h \
+ device/net_io.h \
+ device/param.h \
+ device/tty.h \
+ device/device_reply.cli \
+ device/memory_object_reply.cli \
+ device/device.srv \
+ device/device_pager.srv
+
# kmsg device.
if enable_kmsg
libkernel_a_SOURCES += \
Index: i386/Makefrag.am
===================================================================
RCS file: /cvsroot/hurd/gnumach/i386/Attic/Makefrag.am,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 Makefrag.am
--- i386/Makefrag.am 15 Oct 2006 14:49:03 -0000 1.1.2.2
+++ i386/Makefrag.am 29 Nov 2006 05:08:59 -0000
@@ -34,6 +34,22 @@ libkernel_a_SOURCES += \
i386/i386at/model_dep.c \
i386/i386at/pic_isa.c
+dist_libkernel_a_SOURCES += \
+ i386/i386at/comreg.h \
+ i386/i386at/cram.h \
+ i386/i386at/dev_hdr.h \
+ i386/i386at/device_emul.h \
+ i386/i386at/disk.h \
+ i386/i386at/i8250.h \
+ i386/i386at/idt.h \
+ i386/i386at/kd.h \
+ i386/i386at/kd_event.h \
+ i386/i386at/kd_mouse.h \
+ i386/i386at/kd_queue.h \
+ i386/i386at/kdsoft.h \
+ i386/i386at/lprreg.h \
+ i386/i386at/rtc.h
+
# lpr device support.
if enable_lpr
libkernel_a_SOURCES += \
@@ -72,6 +88,53 @@ libkernel_a_SOURCES += \
i386/i386/trap.c \
i386/i386/user_ldt.c
+dist_libkernel_a_SOURCES += \
+ i386/ldscript \
+ i386/i386/ast.h \
+ i386/i386/ast_types.h \
+ i386/i386/cpu_number.h \
+ i386/i386/db_machdep.h \
+ i386/i386/debug.h \
+ i386/i386/eflags.h \
+ i386/i386/fpu.h \
+ i386/i386/gdt.h \
+ i386/i386/idt-gen.h \
+ i386/i386/io_emulate.h \
+ i386/i386/io_port.h \
+ i386/i386/iopb.h \
+ i386/i386/ipl.h \
+ i386/i386/ktss.h \
+ i386/i386/kttd_machdep.h \
+ i386/i386/ldt.h \
+ i386/i386/lock.h \
+ i386/i386/locore.h \
+ i386/i386/mach_param.h \
+ i386/i386/machine_routines.h \
+ i386/i386/machspl.h \
+ i386/i386/mp_desc.h \
+ i386/i386/pcb.h \
+ i386/i386/pic.h \
+ i386/i386/pio.h \
+ i386/i386/pit.h \
+ i386/i386/pmap.h \
+ i386/i386/proc_reg.h \
+ i386/i386/sched_param.h \
+ i386/i386/seg.h \
+ i386/i386/setjmp.h \
+ i386/i386/spl.h \
+ i386/i386/thread.h \
+ i386/i386/time_stamp.h \
+ i386/i386/timer.h \
+ i386/i386/trap.h \
+ i386/i386/tss.h \
+ i386/i386/user_ldt.h \
+ i386/i386/vm_param.h \
+ i386/i386/vm_tuning.h \
+ i386/i386/xpr.h \
+ i386/i386/zalloc.h \
+ i386/i386/mach_i386.srv \
+ i386/i386/i386asm.sym
+
# This file is only needed for KDB support.
if enable_kdb
libkernel_a_SOURCES += \
@@ -82,11 +145,17 @@ libkernel_a_SOURCES += \
i386/intel/pmap.c \
i386/intel/read_fault.c
+dist_libkernel_a_SOURCES += \
+ i386/intel/pmap.h
+
# Files from the generic sources that we want.
libkernel_a_SOURCES += \
chips/busses.c \
device/cirbuf.c
+dist_libkernel_a_SOURCES += \
+ chips/busses.h
+
# See Makefrag.am about lib_dep_tr_for_defs.a.
nodist_lib_dep_tr_for_defs_a_SOURCES += \
i386/i386/mach_i386.server.defs.c
Index: linux/Makefrag.am
===================================================================
RCS file: /cvsroot/hurd/gnumach/linux/Attic/Makefrag.am,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 Makefrag.am
--- linux/Makefrag.am 15 Oct 2006 14:49:03 -0000 1.1.2.1
+++ linux/Makefrag.am 29 Nov 2006 05:09:00 -0000
@@ -39,6 +39,8 @@ liblinux_a_CCASFLAGS = $(AM_CCASFLAGS) \
-D__ASSEMBLY__ -traditional \
$(liblinux_a_CPPFLAGS)
+dist_liblinux_a_SOURCES =
+
liblinux_a_SOURCES = \
linux/dev/init/version.c \
linux/dev/kernel/softirq.c \
@@ -60,6 +62,7 @@ liblinux_a_SOURCES = \
liblinux_a_SOURCES += \
linux/src/drivers/pci/pci.c \
linux/dev/drivers/block/genhd.c
+
#
# Linux device drivers.
@@ -76,6 +79,10 @@ liblinux_a_SOURCES += \
linux/src/drivers/block/ide.c \
linux/src/drivers/block/rz1000.c \
linux/src/drivers/block/triton.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/block/ide.h \
+ linux/src/drivers/block/ide_modes.h
endif
if device_driver_group_scsi
@@ -90,6 +97,54 @@ liblinux_a_SOURCES += \
linux/src/drivers/scsi/sd_ioctl.c \
linux/src/drivers/scsi/sr.c \
linux/src/drivers/scsi/sr_ioctl.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/scsi/FlashPoint.c \
+ linux/src/drivers/scsi/53c7,8xx.h \
+ linux/src/drivers/scsi/53c8xx_d.h \
+ linux/src/drivers/scsi/53c8xx_u.h \
+ linux/src/drivers/scsi/AM53C974.h \
+ linux/src/drivers/scsi/BusLogic.h \
+ linux/src/drivers/scsi/NCR5380.h \
+ linux/src/drivers/scsi/NCR5380.c \
+ linux/src/drivers/scsi/NCR53c406a.h \
+ linux/src/drivers/scsi/advansys.h \
+ linux/src/drivers/scsi/aha152x.h \
+ linux/src/drivers/scsi/aha1542.h \
+ linux/src/drivers/scsi/aha1740.h \
+ linux/src/drivers/scsi/aic7xxx.h \
+ linux/src/drivers/scsi/aic7xxx_reg.h \
+ linux/src/drivers/scsi/constants.h \
+ linux/src/drivers/scsi/dc390.h \
+ linux/src/drivers/scsi/dtc.h \
+ linux/src/drivers/scsi/eata.h \
+ linux/src/drivers/scsi/eata_dma.h \
+ linux/src/drivers/scsi/eata_dma_proc.h \
+ linux/src/drivers/scsi/eata_dma_proc.c \
+ linux/src/drivers/scsi/eata_generic.h \
+ linux/src/drivers/scsi/eata_pio.h \
+ linux/src/drivers/scsi/fdomain.h \
+ linux/src/drivers/scsi/g_NCR5380.h \
+ linux/src/drivers/scsi/gdth.h \
+ linux/src/drivers/scsi/gdth_ioctl.h \
+ linux/src/drivers/scsi/gdth_proc.h \
+ linux/src/drivers/scsi/hosts.h \
+ linux/src/drivers/scsi/in2000.h \
+ linux/src/drivers/scsi/ncr53c8xx.h \
+ linux/src/drivers/scsi/pas16.h \
+ linux/src/drivers/scsi/ppa.h \
+ linux/src/drivers/scsi/qlogicfas.h \
+ linux/src/drivers/scsi/qlogicisp.h \
+ linux/src/drivers/scsi/scripts.h \
+ linux/src/drivers/scsi/scsi.h \
+ linux/src/drivers/scsi/sd.h \
+ linux/src/drivers/scsi/seagate.h \
+ linux/src/drivers/scsi/sr.h \
+ linux/src/drivers/scsi/t128.h \
+ linux/src/drivers/scsi/tmscsim.h \
+ linux/src/drivers/scsi/u14-34f.h \
+ linux/src/drivers/scsi/ultrastor.h \
+ linux/src/drivers/scsi/wd7000.h
endif
if device_driver_53c78xx
@@ -135,6 +190,12 @@ endif
if device_driver_aic7xxx
liblinux_a_SOURCES += \
linux/src/drivers/scsi/aic7xxx.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/scsi/aic7xxx_proc.c \
+ linux/src/drivers/scsi/aic7xxx_seq.c \
+ linux/src/drivers/scsi/aic7xxx/scsi_message.h \
+ linux/src/drivers/scsi/aic7xxx/sequencer.h
endif
if device_driver_dtc
@@ -155,6 +216,9 @@ endif
if device_driver_eata_pio
liblinux_a_SOURCES += \
linux/src/drivers/scsi/eata_pio.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/scsi/eata_pio_proc.c
endif
if device_driver_fdomain
@@ -170,6 +234,9 @@ endif
if device_driver_gdth
liblinux_a_SOURCES += \
linux/src/drivers/scsi/gdth.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/scsi/gdth_proc.c
endif
if device_driver_in2000
@@ -215,6 +282,9 @@ endif
if device_driver_tmscsim
liblinux_a_SOURCES += \
linux/src/drivers/scsi/tmscsim.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/scsi/scsiiom.c
endif
if device_driver_u14_34f
@@ -240,6 +310,29 @@ liblinux_a_SOURCES += \
linux/dev/net/core/dev.c \
linux/dev/drivers/net/net_init.c \
linux/src/drivers/net/pci-scan.c
+
+dist_liblinux_a_SOURCES += \
+ linux/src/drivers/net/3c503.h \
+ linux/src/drivers/net/3c505.h \
+ linux/src/drivers/net/8390.h \
+ linux/src/drivers/net/atp.h \
+ linux/src/drivers/net/de4x5.h \
+ linux/src/drivers/net/de620.h \
+ linux/src/drivers/net/depca.h \
+ linux/src/drivers/net/eth82586.h \
+ linux/src/drivers/net/ewrk3.h \
+ linux/src/drivers/net/hp100.h \
+ linux/src/drivers/net/i82586.h \
+ linux/src/drivers/net/iow.h \
+ linux/src/drivers/net/kern_compat.h \
+ linux/src/drivers/net/ni52.h \
+ linux/src/drivers/net/ni65.h \
+ linux/src/drivers/net/pci-scan.h \
+ linux/src/drivers/net/seeq8005.h \
+ linux/src/drivers/net/sk_g16.h \
+ linux/src/drivers/net/tlan.h \
+ linux/src/drivers/net/wavelan.h \
+ linux/src/drivers/net/wavelan.p.h
endif
if device_driver_3c501