From be370d728ef6fba8b7f5132a3dd11f1ea1639c01 Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Sun, 23 Jul 2023 17:05:47 +0800 Subject: [PATCH] shared: update Makefile and related packages --- trunk/configure | 4 +- trunk/user/.gitignore | 1 + trunk/user/LPRng/Makefile | 281 +------ trunk/user/LPRng/Makefile.in | 269 ------- trunk/user/LPRng/mkinstalldirs | 40 - trunk/user/LPRng/{ => src}/ABOUT-NLS | 0 trunk/user/LPRng/{ => src}/ABOUT-NLS.LPRng | 0 trunk/user/LPRng/{ => src}/CHANGES | 0 trunk/user/LPRng/{ => src}/CONFIG_JW | 0 trunk/user/LPRng/{ => src}/CONTRIBUTORS | 0 trunk/user/LPRng/{ => src}/COPYRIGHT | 0 trunk/user/LPRng/{ => src}/CREATE_CONFIGURE | 0 trunk/user/LPRng/{ => src}/ChangeLog | 0 .../{ => src}/DISTRIBUTIONS/BSDI/Makefile | 0 .../LPRng-3.8.22.tbz | Bin .../FreeBSD-4.ports.sysutils.LPRng/Makefile | 0 .../Makefile.build | 0 .../FreeBSD-4.ports.sysutils.LPRng/distinfo | 0 .../files-pkg-message | 0 .../pkg-deinstall | 0 .../FreeBSD-4.ports.sysutils.LPRng/pkg-descr | 0 .../pkg-install | 0 .../pkg-message | 0 .../FreeBSD-4.ports.sysutils.LPRng/pkg-plist | 0 .../LPRng/{ => src}/DISTRIBUTIONS/Makefile | 0 .../LPRng/{ => src}/DISTRIBUTIONS/Makefile,v | 0 .../LPRng/{ => src}/DISTRIBUTIONS/Makefile.in | 0 .../user/LPRng/{ => src}/DISTRIBUTIONS/README | 0 .../DISTRIBUTIONS/RPM.RedHat/LPRng.spec | 0 .../DISTRIBUTIONS/RPM.RedHat/Makefile | 0 .../{ => src}/DISTRIBUTIONS/RPM.RedHat/UNPACK | 0 .../DISTRIBUTIONS/RPM.RedHat/lpd.init | 0 .../DISTRIBUTIONS/Solaris.pkg/Makefile | 0 .../DISTRIBUTIONS/Solaris.pkg/README | 0 .../DISTRIBUTIONS/Solaris.pkg/UNPACK | 0 .../DISTRIBUTIONS/Solaris.pkg/copyright | 0 .../DISTRIBUTIONS/Solaris.pkg/i.preserve | 0 .../DISTRIBUTIONS/Solaris.pkg/inetd.conf | 0 .../DISTRIBUTIONS/Solaris.pkg/prototype.pre | 0 .../DISTRIBUTIONS/Solaris.pkg/r.preserve | 0 trunk/user/LPRng/{ => src}/INSTALL | 0 .../LPRng/{ => src}/KERBEROS_configuration | 0 trunk/user/LPRng/{ => src}/LICENSE | 0 trunk/user/LPRng/{ => src}/LINK | 0 trunk/user/LPRng/{ => src}/MIRRORS | 0 trunk/user/LPRng/{ => src}/MIT_configure | 0 trunk/user/LPRng/src/Makefile | 741 ++++++------------ trunk/user/LPRng/src/Makefile.in | 705 ++++++----------- trunk/user/LPRng/{ => src}/README | 0 .../user/LPRng/{ => src}/README.SSL.SECURITY | 0 trunk/user/LPRng/{ => src}/README.ports | 0 .../LPRng/{ => src}/STANDARD_configuration | 0 .../LPRng/{ => src}/TESTSUPPORT/LPD/t1/accnt | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA001taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA002taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA003taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA004taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA007taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA067taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA070taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA335taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA343taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA637taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA672taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/cfA692taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA001taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA002taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA004taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA007taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA067taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA070taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA335taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA343taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA506taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA517taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA637taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA672taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/dfA692taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/hfA335taco | 0 .../{ => src}/TESTSUPPORT/LPD/t1/hfA637taco | 0 .../LPRng/{ => src}/TESTSUPPORT/LPD/t1/log | 0 .../{ => src}/TESTSUPPORT/LPD/t1/printcap | 0 .../LPRng/{ => src}/TESTSUPPORT/LPD/t1/t1 | 0 .../{ => src}/TESTSUPPORT/LPD/t2/cfA335taco | 0 .../{ => src}/TESTSUPPORT/LPD/t2/dfA335taco | 0 .../LPRng/{ => src}/TESTSUPPORT/LPD/t2/log | 0 .../LPRng/{ => src}/TESTSUPPORT/LPD/t2/t2 | 0 .../user/LPRng/{ => src}/TESTSUPPORT/Makefile | 0 .../LPRng/{ => src}/TESTSUPPORT/Makefile.in | 0 trunk/user/LPRng/{ => src}/TESTSUPPORT/README | 0 .../LPRng/{ => src}/TESTSUPPORT/bqfilter.sh | 0 .../user/LPRng/{ => src}/TESTSUPPORT/clearlog | 0 .../{ => src}/TESTSUPPORT/common.conf.proto | 0 .../{ => src}/TESTSUPPORT/control_filter | 0 .../LPRng/{ => src}/TESTSUPPORT/dbserver.sh | 0 trunk/user/LPRng/{ => src}/TESTSUPPORT/filter | 0 .../LPRng/{ => src}/TESTSUPPORT/filter.sh | 0 .../{ => src}/TESTSUPPORT/lpd.conf.proto | 0 .../{ => src}/TESTSUPPORT/lpd.perms.proto | 0 .../{ => src}/TESTSUPPORT/lpd_printcap.proto | 0 trunk/user/LPRng/{ => src}/TESTSUPPORT/makedb | 0 .../LPRng/{ => src}/TESTSUPPORT/mkinstalldirs | 0 .../{ => src}/TESTSUPPORT/printcap.proto | 0 .../LPRng/{ => src}/TESTSUPPORT/router.sh | 0 trunk/user/LPRng/{ => src}/TODO | 0 trunk/user/LPRng/{ => src}/TopLevelMakefile | 0 trunk/user/LPRng/{ => src}/UPDATE | 0 trunk/user/LPRng/{ => src}/UTILS/CIFAST | 0 trunk/user/LPRng/{ => src}/UTILS/LPRng.pm | 0 trunk/user/LPRng/{ => src}/UTILS/LPRng.pm.in | 0 trunk/user/LPRng/{ => src}/UTILS/Makefile | 0 trunk/user/LPRng/{ => src}/UTILS/Makefile.in | 0 trunk/user/LPRng/{ => src}/UTILS/README | 0 .../{ => src}/UTILS/README.ForKerberosHackers | 0 .../user/LPRng/{ => src}/UTILS/accounting.pl | 0 .../LPRng/{ => src}/UTILS/accounting.pl.in | 0 trunk/user/LPRng/{ => src}/UTILS/atalkprint | 0 trunk/user/LPRng/{ => src}/UTILS/chooser.in | 0 .../{ => src}/UTILS/decode_args_with_perl | 0 .../{ => src}/UTILS/decode_args_with_perl.in | 0 .../LPRng/{ => src}/UTILS/decode_args_with_sh | 0 .../{ => src}/UTILS/decode_args_with_sh.in | 0 trunk/user/LPRng/{ => src}/UTILS/fixid | 0 trunk/user/LPRng/{ => src}/UTILS/fixid.in | 0 trunk/user/LPRng/{ => src}/UTILS/fixupdate | 0 trunk/user/LPRng/{ => src}/UTILS/fixupdate.in | 0 trunk/user/LPRng/{ => src}/UTILS/freefs.c | 0 trunk/user/LPRng/{ => src}/UTILS/hello.ps | Bin trunk/user/LPRng/{ => src}/UTILS/linetest.c | 0 trunk/user/LPRng/{ => src}/UTILS/lpq_in_perl | 0 .../user/LPRng/{ => src}/UTILS/lpq_in_perl.in | 0 trunk/user/LPRng/{ => src}/UTILS/lpr_in_perl | 0 .../user/LPRng/{ => src}/UTILS/lpr_in_perl.in | 0 trunk/user/LPRng/{ => src}/UTILS/lprm_in_perl | 0 .../LPRng/{ => src}/UTILS/lprm_in_perl.in | 0 .../user/LPRng/{ => src}/UTILS/make_lpd_conf | 0 .../LPRng/{ => src}/UTILS/make_lpd_conf.in | 0 .../LPRng/{ => src}/UTILS/make_printcap_use | 0 .../{ => src}/UTILS/make_printcap_use.in | 0 trunk/user/LPRng/{ => src}/UTILS/makeinc | 0 trunk/user/LPRng/{ => src}/UTILS/makeinc.in | 0 trunk/user/LPRng/{ => src}/UTILS/ncpprint | 0 trunk/user/LPRng/{ => src}/UTILS/one.pcl | 0 trunk/user/LPRng/{ => src}/UTILS/one.pjl | 0 trunk/user/LPRng/{ => src}/UTILS/one.ps | Bin trunk/user/LPRng/{ => src}/UTILS/read_conf | 0 trunk/user/LPRng/{ => src}/UTILS/read_conf.in | 0 .../user/LPRng/{ => src}/UTILS/remote_active | 0 .../LPRng/{ => src}/UTILS/remote_active.in | 0 .../user/LPRng/{ => src}/UTILS/set_file_time | Bin .../LPRng/{ => src}/UTILS/set_file_time.c | 0 trunk/user/LPRng/{ => src}/UTILS/smbprint | 0 trunk/user/LPRng/{ => src}/UTILS/tcpsend.c | 0 trunk/user/LPRng/{ => src}/UTILS/termcap.c | 0 trunk/user/LPRng/{ => src}/UTILS/test_read | 0 trunk/user/LPRng/{ => src}/UTILS/test_read.in | 0 .../user/LPRng/{ => src}/UTILS/test_rw_pipe.c | 0 trunk/user/LPRng/{ => src}/UTILS/testpr | 0 trunk/user/LPRng/{ => src}/UTILS/update_z.pl | 0 .../user/LPRng/{ => src}/UTILS/update_z.pl.in | 0 trunk/user/LPRng/{ => src}/UTILS/xlate.c | 0 trunk/user/LPRng/{ => src}/VERSION | 0 trunk/user/LPRng/{ => src}/Y2KCompliance | 0 trunk/user/LPRng/{ => src}/acinclude.m4 | 0 trunk/user/LPRng/{ => src}/aclocal.m4 | 0 trunk/user/LPRng/{ => src}/asus_README | 0 trunk/user/LPRng/{ => src}/config.guess | 0 trunk/user/LPRng/{ => src}/config.h | 0 trunk/user/LPRng/{ => src}/config.h.in | 0 trunk/user/LPRng/{ => src}/config.rpath | 0 trunk/user/LPRng/{ => src}/config.sub | 0 trunk/user/LPRng/{ => src}/configure | 0 trunk/user/LPRng/{ => src}/configure.in | 0 trunk/user/LPRng/{ => src}/hfA018 | 0 trunk/user/LPRng/{ => src}/init.freebsd.sh | 0 trunk/user/LPRng/{ => src}/init.linux.sh | 0 trunk/user/LPRng/{ => src}/init.linuxsb.sh | 0 trunk/user/LPRng/{ => src}/init.redhat.sh | 0 trunk/user/LPRng/{ => src}/init.solaris.sh | 0 trunk/user/LPRng/{ => src}/libtool | 0 trunk/user/LPRng/{ => src}/lpd.perms | 0 trunk/user/LPRng/{ => src}/lpd.perms.in | 0 trunk/user/LPRng/{ => src}/lpd_STATFS | Bin trunk/user/LPRng/{ => src}/ltconfig | 0 trunk/user/LPRng/{ => src}/ltmain.sh | 0 trunk/user/LPRng/{ => src}/man/Makefile | 0 trunk/user/LPRng/{ => src}/man/Makefile.in | 0 trunk/user/LPRng/{ => src}/man/README | 0 trunk/user/LPRng/{ => src}/man/cancel.n | 0 trunk/user/LPRng/{ => src}/man/checkpc.n | 0 trunk/user/LPRng/{ => src/man}/install-sh | 0 trunk/user/LPRng/{ => src}/man/lp.n | 0 trunk/user/LPRng/{ => src}/man/lpbanner.n | 0 trunk/user/LPRng/{ => src}/man/lpc.n | 0 trunk/user/LPRng/{ => src}/man/lpd.conf.n | 0 trunk/user/LPRng/{ => src}/man/lpd.n | 0 trunk/user/LPRng/{ => src}/man/lpd.perms.n | 0 trunk/user/LPRng/{ => src}/man/lpf.n | 0 trunk/user/LPRng/{ => src}/man/lpq.n | 0 trunk/user/LPRng/{ => src}/man/lpr.n | 0 trunk/user/LPRng/{ => src}/man/lprm.n | 0 trunk/user/LPRng/{ => src}/man/lprng_certs.n | 0 .../LPRng/{ => src}/man/lprng_index_certs.n | 0 trunk/user/LPRng/{ => src}/man/lpstat.n | 0 trunk/user/LPRng/{ => src}/man/mkinstalldirs | 0 trunk/user/LPRng/{ => src}/man/monitor.n | 0 trunk/user/LPRng/{ => src}/man/pclbanner.n | 0 trunk/user/LPRng/{ => src}/man/printcap.n | 0 trunk/user/LPRng/{ => src}/man/psbanner.n | 0 trunk/user/LPRng/src/mkinstalldirs | 38 +- trunk/user/LPRng/{ => src}/po/ChangeLog | 0 trunk/user/LPRng/{ => src}/po/LPRng.pot | 0 trunk/user/LPRng/{ => src}/po/Makefile | 0 trunk/user/LPRng/{ => src}/po/Makefile.in | 0 trunk/user/LPRng/{ => src}/po/Makefile.in.in | 0 trunk/user/LPRng/{ => src}/po/Makevars | 0 trunk/user/LPRng/{ => src}/po/POTFILES | 0 trunk/user/LPRng/{ => src}/po/POTFILES.in | 0 trunk/user/LPRng/{ => src}/po/Rules-quot | 0 trunk/user/LPRng/{ => src}/po/boldquot.sed | 0 .../LPRng/{ => src}/po/en@boldquot.header | 0 trunk/user/LPRng/{ => src}/po/en@quot.header | 0 trunk/user/LPRng/{ => src}/po/fr.gmo | Bin trunk/user/LPRng/{ => src}/po/fr.po | 0 .../user/LPRng/{ => src}/po/insert-header.sin | 0 trunk/user/LPRng/{ => src}/po/quot.sed | 0 .../LPRng/{ => src}/po/remove-potcdate.sed | 0 .../LPRng/{ => src}/po/remove-potcdate.sin | 0 .../LPRng/{ => src}/postinstall.freebsd.sh | 0 .../LPRng/{ => src}/postinstall.generic.sh | 0 .../user/LPRng/{ => src}/postinstall.linux.sh | 0 .../LPRng/{ => src}/postinstall.solaris.sh | 0 .../LPRng/{ => src}/postremove.generic.sh | 0 .../LPRng/{ => src}/postremove.solaris.sh | 0 .../LPRng/{ => src}/preinstall.solaris.sh | 0 .../user/LPRng/{ => src}/preremove.freebsd.sh | 0 .../user/LPRng/{ => src}/preremove.generic.sh | 0 trunk/user/LPRng/{ => src}/preremove.linux.sh | 0 .../user/LPRng/{ => src}/preremove.solaris.sh | 0 trunk/user/LPRng/{ => src}/printcap | 0 trunk/user/LPRng/{ => src}/printer.c | 0 trunk/user/LPRng/src/{ => src}/.cfg | 0 .../src/{ => src}/AUTHENTICATE/sclient.c | 0 .../src/{ => src}/AUTHENTICATE/sserver.c | 0 trunk/user/LPRng/src/src/Makefile | 568 ++++++++++++++ trunk/user/LPRng/src/{ => src}/Makefile.brcm | 0 trunk/user/LPRng/src/src/Makefile.in | 538 +++++++++++++ .../LPRng/src/{ => src}/common/accounting.c | 0 .../user/LPRng/src/{ => src}/common/checkpc.c | 0 trunk/user/LPRng/src/{ => src}/common/child.c | 0 .../LPRng/src/{ => src}/common/controlword.c | 0 .../LPRng/src/{ => src}/common/copyright.c | 0 trunk/user/LPRng/src/{ => src}/common/debug.c | 0 .../LPRng/src/{ => src}/common/errormsg.c | 0 .../LPRng/src/{ => src}/common/fileopen.c | 0 .../LPRng/src/{ => src}/common/gethostinfo.c | 0 .../user/LPRng/src/{ => src}/common/getopt.c | 0 .../LPRng/src/{ => src}/common/getprinter.c | 0 .../LPRng/src/{ => src}/common/getqueue.c | 0 .../LPRng/src/{ => src}/common/globmatch.c | 0 .../LPRng/src/{ => src}/common/initialize.c | 0 .../LPRng/src/{ => src}/common/krb5_auth.c | 0 .../LPRng/src/{ => src}/common/linelist.c | 0 .../LPRng/src/{ => src}/common/linksupport.c | 0 .../LPRng/src/{ => src}/common/lockfile.c | 0 .../LPRng/src/{ => src}/common/lpbanner.c | 0 trunk/user/LPRng/src/{ => src}/common/lpc.c | 0 trunk/user/LPRng/src/{ => src}/common/lpd.c | 0 .../LPRng/src/{ => src}/common/lpd_control.c | 0 .../LPRng/src/{ => src}/common/lpd_dispatch.c | 0 .../LPRng/src/{ => src}/common/lpd_jobs.c | 0 .../LPRng/src/{ => src}/common/lpd_lisa.c | 0 .../LPRng/src/{ => src}/common/lpd_logger.c | 0 .../LPRng/src/{ => src}/common/lpd_rcvjob.c | 0 .../LPRng/src/{ => src}/common/lpd_remove.c | 0 .../LPRng/src/{ => src}/common/lpd_secure.c | 0 .../LPRng/src/{ => src}/common/lpd_status.c | 0 trunk/user/LPRng/src/{ => src}/common/lpf.c | 0 trunk/user/LPRng/src/{ => src}/common/lpq.c | 0 trunk/user/LPRng/src/{ => src}/common/lpr.c | 0 trunk/user/LPRng/src/{ => src}/common/lprm.c | 0 .../user/LPRng/src/{ => src}/common/lpstat.c | 0 trunk/user/LPRng/src/{ => src}/common/md5.c | 0 trunk/user/LPRng/src/{ => src}/common/merge.c | 0 .../user/LPRng/src/{ => src}/common/monitor.c | 0 .../LPRng/src/{ => src}/common/permission.c | 0 .../LPRng/src/{ => src}/common/plp_snprintf.c | 0 .../LPRng/src/{ => src}/common/printjob.c | 0 .../LPRng/src/{ => src}/common/proctitle.c | 0 .../LPRng/src/{ => src}/common/sendauth.c | 0 .../user/LPRng/src/{ => src}/common/sendjob.c | 0 .../LPRng/src/{ => src}/common/sendmail.c | 0 .../user/LPRng/src/{ => src}/common/sendreq.c | 0 .../LPRng/src/{ => src}/common/ssl_auth.c | 0 trunk/user/LPRng/src/{ => src}/common/stty.c | 0 .../LPRng/src/{ => src}/common/user_auth.c | 0 .../LPRng/src/{ => src}/common/user_objs.c | 0 .../LPRng/src/{ => src}/common/utilities.c | 0 trunk/user/LPRng/src/{ => src}/common/vars.c | 0 trunk/user/LPRng/src/{ => src}/fixupdate | 0 trunk/user/LPRng/src/{ => src}/freefs.c | 0 .../LPRng/src/{ => src}/include/accounting.h | 0 .../LPRng/src/{ => src}/include/checkpc.h | 0 .../user/LPRng/src/{ => src}/include/child.h | 0 .../LPRng/src/{ => src}/include/control.h | 0 .../LPRng/src/{ => src}/include/copyright.h | 0 .../user/LPRng/src/{ => src}/include/debug.h | 0 .../LPRng/src/{ => src}/include/errorcodes.h | 0 .../LPRng/src/{ => src}/include/errormsg.h | 0 .../LPRng/src/{ => src}/include/fileopen.h | 0 .../LPRng/src/{ => src}/include/gethostinfo.h | 0 .../user/LPRng/src/{ => src}/include/getopt.h | 0 .../LPRng/src/{ => src}/include/getprinter.h | 0 .../LPRng/src/{ => src}/include/getqueue.h | 0 .../LPRng/src/{ => src}/include/globmatch.h | 0 .../LPRng/src/{ => src}/include/initialize.h | 0 .../LPRng/src/{ => src}/include/krb5_auth.h | 0 .../LPRng/src/{ => src}/include/license.h | 0 .../LPRng/src/{ => src}/include/linelist.h | 0 .../LPRng/src/{ => src}/include/linksupport.h | 0 .../LPRng/src/{ => src}/include/lockfile.h | 0 trunk/user/LPRng/src/{ => src}/include/lp.h | 0 .../LPRng/src/{ => src}/include/lp_asus.h | 0 trunk/user/LPRng/src/{ => src}/include/lpc.h | 0 trunk/user/LPRng/src/{ => src}/include/lpd.h | 0 .../LPRng/src/{ => src}/include/lpd_control.h | 0 .../src/{ => src}/include/lpd_dispatch.h | 0 .../LPRng/src/{ => src}/include/lpd_jobs.h | 0 .../LPRng/src/{ => src}/include/lpd_logger.h | 0 .../LPRng/src/{ => src}/include/lpd_rcvjob.h | 0 .../LPRng/src/{ => src}/include/lpd_remove.h | 0 .../LPRng/src/{ => src}/include/lpd_secure.h | 0 .../LPRng/src/{ => src}/include/lpd_status.h | 0 trunk/user/LPRng/src/{ => src}/include/lpq.h | 0 trunk/user/LPRng/src/{ => src}/include/lpr.h | 0 trunk/user/LPRng/src/{ => src}/include/lprm.h | 0 .../user/LPRng/src/{ => src}/include/lpstat.h | 0 trunk/user/LPRng/src/{ => src}/include/md5.h | 0 .../user/LPRng/src/{ => src}/include/merge.h | 0 .../LPRng/src/{ => src}/include/patchlevel.h | 0 .../LPRng/src/{ => src}/include/permission.h | 0 .../src/{ => src}/include/plp_snprintf.h | 0 .../LPRng/src/{ => src}/include/portable.h | 0 .../LPRng/src/{ => src}/include/printjob.h | 0 .../LPRng/src/{ => src}/include/proctitle.h | 0 .../LPRng/src/{ => src}/include/readstatus.h | 0 .../LPRng/src/{ => src}/include/sendauth.h | 0 .../LPRng/src/{ => src}/include/sendjob.h | 0 .../LPRng/src/{ => src}/include/sendmail.h | 0 .../LPRng/src/{ => src}/include/sendreq.h | 0 .../LPRng/src/{ => src}/include/ssl_auth.h | 0 trunk/user/LPRng/src/{ => src}/include/stty.h | 0 .../LPRng/src/{ => src}/include/user_auth.h | 0 .../LPRng/src/{ => src}/include/user_objs.h | 0 .../LPRng/src/{ => src}/include/utilities.h | 0 .../LPRng/src/{ => src}/include/wlancom.h | 0 trunk/user/LPRng/{man => src/src}/install-sh | 0 trunk/user/LPRng/src/{ => src}/lprng_certs.sh | 0 .../LPRng/src/{ => src}/lprng_index_certs.sh | 0 trunk/user/LPRng/src/src/mkinstalldirs | 74 ++ trunk/user/LPRng/src/{ => src}/pclbanner | 0 trunk/user/LPRng/src/{ => src}/pclbanner.in | 0 trunk/user/LPRng/src/{ => src}/psbanner | 0 trunk/user/LPRng/src/{ => src}/psbanner.in | 0 .../user/LPRng/{ => src}/working_binaries/lpd | Bin .../{ => src}/working_binaries/lpd_usbonly | Bin .../{ => src}/working_binaries/printer.c | 0 .../working_binaries/printer.o.rename | Bin trunk/user/Makefile | 3 + trunk/user/{shared => }/boards.mk | 2 +- trunk/user/{shared => }/cflags.mk | 0 trunk/user/httpd/Makefile | 68 +- trunk/user/httpd/src/Makefile | 58 ++ trunk/user/httpd/{ => src}/aidisk.c | 0 trunk/user/httpd/{ => src}/aspbw.c | 0 trunk/user/httpd/{ => src}/base64.c | 0 trunk/user/httpd/{ => src}/cgi.c | 0 trunk/user/httpd/{ => src}/common.c | 0 trunk/user/httpd/{ => src}/common.h | 0 trunk/user/httpd/{ => src}/crc32.c | 0 trunk/user/httpd/{ => src}/dbapi.c | 0 trunk/user/httpd/{ => src}/dbapi.h | 0 trunk/user/httpd/{ => src}/ej.c | 0 trunk/user/httpd/{ => src}/httpd.c | 0 trunk/user/httpd/{ => src}/httpd.h | 0 trunk/user/httpd/{ => src}/https.c | 0 trunk/user/httpd/{ => src}/image.h | 0 trunk/user/httpd/{ => src}/initial_web_hook.c | 0 trunk/user/httpd/{ => src}/nvram_x.c | 0 trunk/user/httpd/{ => src}/nvram_x.h | 0 trunk/user/httpd/{ => src}/ralink.c | 0 trunk/user/httpd/{ => src}/switch_mtk_esw.c | 0 trunk/user/httpd/{ => src}/switch_rtl8367.c | 0 trunk/user/httpd/{ => src}/tdate_parse.c | 0 trunk/user/httpd/{ => src}/upload.c | 0 trunk/user/httpd/{ => src}/variables.c | 0 trunk/user/httpd/{ => src}/web_ex.c | 0 trunk/user/infosvr/Makefile | 24 +- trunk/user/infosvr/src/Makefile | 19 + trunk/user/infosvr/{ => src}/asus.c | 2 +- trunk/user/infosvr/{ => src}/infosvr.c | 2 +- trunk/user/infosvr/{ => src}/infosvr.h | 0 trunk/user/libdisk/Makefile | 43 +- trunk/user/libdisk/src/Makefile | 32 + trunk/user/libdisk/{ => src}/dev_info.c | 0 trunk/user/libdisk/{ => src}/dev_info.h | 0 trunk/user/libdisk/{ => src}/disk_initial.c | 2 +- trunk/user/libdisk/{ => src}/disk_initial.h | 0 trunk/user/libdisk/{ => src}/disk_io_tools.c | 0 trunk/user/libdisk/{ => src}/disk_io_tools.h | 0 trunk/user/libdisk/{ => src}/disk_share.c | 0 trunk/user/libdisk/{ => src}/disk_share.h | 0 trunk/user/libdisk/{ => src}/disk_test.c | 0 trunk/user/libdisk/{ => src}/test_share.c | 0 trunk/user/libdisk/{ => src}/usb_info.c | 2 +- trunk/user/libdisk/{ => src}/usb_info.h | 0 trunk/user/lldt/Makefile | 34 +- trunk/user/lldt/icon.large.ico | Bin 9662 -> 0 bytes trunk/user/lldt/src/Makefile | 17 +- trunk/user/lldt/src/common.mk | 6 - trunk/user/networkmap/Makefile | 25 +- trunk/user/networkmap/src/Makefile | 13 + trunk/user/networkmap/{ => src}/function.c | 2 +- trunk/user/networkmap/{ => src}/networkmap.c | 0 trunk/user/networkmap/{ => src}/networkmap.h | 2 +- trunk/user/nvram/Makefile | 52 +- trunk/user/nvram/src/Makefile | 44 ++ trunk/user/nvram/{ => src}/nvram.c | 0 trunk/user/rc/Makefile | 257 +++--- trunk/user/rc/src/Makefile | 65 ++ trunk/user/rc/{ => src}/auth.c | 0 trunk/user/rc/{ => src}/btn_action.c | 0 trunk/user/rc/{ => src}/common_ex.c | 0 trunk/user/rc/{ => src}/detect_internet.c | 0 trunk/user/rc/{ => src}/detect_link.c | 0 trunk/user/rc/{ => src}/detect_wan.c | 0 trunk/user/rc/{ => src}/firewall_ex.c | 0 trunk/user/rc/{ => src}/gpio_btn.c | 0 trunk/user/rc/{ => src}/gpio_pins.c | 0 trunk/user/rc/{ => src}/gpio_pins.h | 0 trunk/user/rc/{ => src}/hotplug_stor.c | 0 trunk/user/rc/{ => src}/hotplug_usb.c | 0 trunk/user/rc/{ => src}/inicd.c | 0 trunk/user/rc/{ => src}/init.c | 0 trunk/user/rc/{ => src}/net.c | 0 trunk/user/rc/{ => src}/net6.c | 0 trunk/user/rc/{ => src}/net_lan.c | 0 trunk/user/rc/{ => src}/net_lan6.c | 0 trunk/user/rc/{ => src}/net_ppp.c | 0 trunk/user/rc/{ => src}/net_wan.c | 0 trunk/user/rc/{ => src}/net_wan6.c | 0 trunk/user/rc/{ => src}/net_wifi.c | 0 trunk/user/rc/{ => src}/ralink.c | 0 trunk/user/rc/{ => src}/rc.c | 0 trunk/user/rc/{ => src}/rc.h | 0 trunk/user/rc/{ => src}/rstats.c | 2 +- trunk/user/rc/{ => src}/services.c | 0 trunk/user/rc/{ => src}/services_ex.c | 0 trunk/user/rc/{ => src}/services_stor.c | 0 trunk/user/rc/{ => src}/services_usb.c | 0 trunk/user/rc/{ => src}/smp.c | 0 trunk/user/rc/{ => src}/switch.h | 0 trunk/user/rc/{ => src}/switch_mtk_esw.c | 0 trunk/user/rc/{ => src}/switch_rtl8367.c | 0 trunk/user/rc/{ => src}/usb_modem.c | 0 trunk/user/rc/{ => src}/vpn_client.c | 0 trunk/user/rc/{ => src}/vpn_openvpn.c | 0 trunk/user/rc/{ => src}/vpn_server.c | 0 trunk/user/rc/{ => src}/watchdog.c | 0 trunk/user/shared/.gitignore | 2 - trunk/user/shared/Makefile | 26 +- trunk/user/shared/src/Makefile | 33 + trunk/user/shared/{ => src}/bin_sem_asus.c | 0 trunk/user/shared/{ => src}/bin_sem_asus.h | 0 trunk/user/shared/{ => src}/defaults.c | 0 trunk/user/shared/{ => src}/defaults.h | 0 trunk/user/shared/{ => src}/flash_mtd.c | 0 trunk/user/shared/{ => src}/flash_mtd.h | 0 trunk/user/shared/{ => src}/gpioutils.c | 0 trunk/user/shared/{ => src}/gpioutils.h | 0 trunk/user/shared/src/include/.gitignore | 1 + .../user/shared/{ => src}/include/bsd_queue.h | 0 trunk/user/shared/{ => src}/include/ibox.h | 0 trunk/user/shared/{ => src}/include/mtd-abi.h | 0 .../shared/{ => src}/include/ralink_boards.h | 0 .../shared/{ => src}/include/ralink_priv.h | 0 trunk/user/shared/{ => src}/netutils.c | 0 trunk/user/shared/{ => src}/netutils.h | 0 trunk/user/shared/{ => src}/notify_rc.c | 0 trunk/user/shared/{ => src}/notify_rc.h | 0 trunk/user/shared/{ => src}/nvram_linux.c | 0 trunk/user/shared/{ => src}/nvram_linux.h | 0 trunk/user/shared/{ => src}/pids.c | 0 trunk/user/shared/{ => src}/rstats.h | 0 trunk/user/shared/{ => src}/rtutils.c | 0 trunk/user/shared/{ => src}/rtutils.h | 0 trunk/user/shared/{ => src}/shutils.c | 0 trunk/user/shared/{ => src}/shutils.h | 0 trunk/user/u2ec/Makefile | 47 +- trunk/user/u2ec/src/Makefile | 37 + trunk/user/u2ec/{ => src}/debug.c | 0 trunk/user/u2ec/{ => src}/decode.c | 0 trunk/user/u2ec/{ => src}/decode.h | 0 trunk/user/u2ec/{ => src}/poppack.h | 0 trunk/user/u2ec/{ => src}/pshpack1.h | 0 trunk/user/u2ec/{ => src}/testusb.c | 0 trunk/user/u2ec/{ => src}/typeconvert.h | 0 trunk/user/u2ec/{ => src}/u2ec_list.h | 0 trunk/user/u2ec/{ => src}/urb.h | 0 trunk/user/u2ec/{ => src}/urb64.h | 0 trunk/user/u2ec/{ => src}/usb.h | 117 +-- trunk/user/u2ec/{ => src}/usb100.h | 0 trunk/user/u2ec/{ => src}/usbdi.h | 0 trunk/user/u2ec/{ => src}/usbioctl.h | 0 trunk/user/u2ec/{ => src}/usbiodef.h | 0 trunk/user/u2ec/{ => src}/usbsock.c | 0 trunk/user/u2ec/{ => src}/usbsock.h | 0 trunk/user/u2ec/{ => src}/wdm-MJMN.h | 0 trunk/user/vsftpd/Makefile | 46 +- trunk/user/vsftpd/{ => src}/AUDIT | 0 trunk/user/vsftpd/{ => src}/BENCHMARKS | 0 trunk/user/vsftpd/{ => src}/BUGS | 0 trunk/user/vsftpd/{ => src}/COPYING | 0 trunk/user/vsftpd/{ => src}/COPYRIGHT | 0 trunk/user/vsftpd/{ => src}/Changelog | 0 .../{ => src}/EXAMPLE/INTERNET_SITE/README | 0 .../EXAMPLE/INTERNET_SITE/vsftpd.conf | 0 .../EXAMPLE/INTERNET_SITE/vsftpd.xinetd | 0 .../EXAMPLE/INTERNET_SITE_NOINETD/README | 0 .../EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf | 0 .../{ => src}/EXAMPLE/PER_IP_CONFIG/README | 0 .../EXAMPLE/PER_IP_CONFIG/hosts.allow | 0 trunk/user/vsftpd/{ => src}/EXAMPLE/README | 0 .../{ => src}/EXAMPLE/VIRTUAL_HOSTS/README | 0 .../{ => src}/EXAMPLE/VIRTUAL_USERS/README | 0 .../EXAMPLE/VIRTUAL_USERS/logins.txt | 0 .../EXAMPLE/VIRTUAL_USERS/vsftpd.conf | 0 .../EXAMPLE/VIRTUAL_USERS/vsftpd.pam | 0 .../{ => src}/EXAMPLE/VIRTUAL_USERS_2/README | 0 trunk/user/vsftpd/{ => src}/FAQ | 0 trunk/user/vsftpd/{ => src}/INSTALL | 0 trunk/user/vsftpd/{ => src}/LICENSE | 0 trunk/user/vsftpd/src/Makefile | 31 + trunk/user/vsftpd/{ => src}/README | 0 trunk/user/vsftpd/{ => src}/README.security | 0 trunk/user/vsftpd/{ => src}/README.ssl | 0 trunk/user/vsftpd/{ => src}/REFS | 0 trunk/user/vsftpd/{ => src}/REWARD | 0 .../user/vsftpd/{ => src}/RedHat/README.spec | 0 trunk/user/vsftpd/{ => src}/RedHat/vsftpd.log | 0 trunk/user/vsftpd/{ => src}/RedHat/vsftpd.pam | 0 trunk/user/vsftpd/{ => src}/SECURITY/DESIGN | 0 .../vsftpd/{ => src}/SECURITY/IMPLEMENTATION | 0 trunk/user/vsftpd/{ => src}/SECURITY/OVERVIEW | 0 trunk/user/vsftpd/{ => src}/SECURITY/TRUST | 0 trunk/user/vsftpd/{ => src}/SIZE | 0 trunk/user/vsftpd/{ => src}/SPEED | 0 trunk/user/vsftpd/{ => src}/TODO | 0 trunk/user/vsftpd/{ => src}/TUNING | 0 trunk/user/vsftpd/{ => src}/access.c | 0 trunk/user/vsftpd/{ => src}/access.h | 0 trunk/user/vsftpd/{ => src}/ascii.c | 0 trunk/user/vsftpd/{ => src}/ascii.h | 0 trunk/user/vsftpd/{ => src}/asus_ext.c | 0 trunk/user/vsftpd/{ => src}/asus_ext.h | 0 trunk/user/vsftpd/{ => src}/banner.c | 0 trunk/user/vsftpd/{ => src}/banner.h | 0 trunk/user/vsftpd/{ => src}/builddefs.h | 0 trunk/user/vsftpd/{ => src}/defs.h | 0 trunk/user/vsftpd/{ => src}/dummyinc/crypt.h | 0 .../vsftpd/{ => src}/dummyinc/openssl/ssl.h | 0 .../{ => src}/dummyinc/security/pam_appl.h | 0 trunk/user/vsftpd/{ => src}/dummyinc/shadow.h | 0 .../{ => src}/dummyinc/sys/capability.h | 0 .../vsftpd/{ => src}/dummyinc/sys/prctl.h | 0 .../vsftpd/{ => src}/dummyinc/sys/sendfile.h | 0 trunk/user/vsftpd/{ => src}/dummyinc/utmpx.h | 0 trunk/user/vsftpd/{ => src}/features.c | 0 trunk/user/vsftpd/{ => src}/features.h | 0 trunk/user/vsftpd/{ => src}/filesize.h | 0 trunk/user/vsftpd/{ => src}/filestr.c | 0 trunk/user/vsftpd/{ => src}/filestr.h | 0 trunk/user/vsftpd/{ => src}/ftpcmdio.c | 0 trunk/user/vsftpd/{ => src}/ftpcmdio.h | 0 trunk/user/vsftpd/{ => src}/ftpcodes.h | 0 trunk/user/vsftpd/{ => src}/ftpdataio.c | 0 trunk/user/vsftpd/{ => src}/ftpdataio.h | 0 trunk/user/vsftpd/{ => src}/ftppolicy.c | 0 trunk/user/vsftpd/{ => src}/ftppolicy.h | 0 trunk/user/vsftpd/{ => src}/hash.c | 0 trunk/user/vsftpd/{ => src}/hash.h | 0 trunk/user/vsftpd/{ => src}/ipaddrparse.c | 0 trunk/user/vsftpd/{ => src}/ipaddrparse.h | 0 trunk/user/vsftpd/{ => src}/logging.c | 0 trunk/user/vsftpd/{ => src}/logging.h | 0 trunk/user/vsftpd/{ => src}/ls.c | 0 trunk/user/vsftpd/{ => src}/ls.h | 0 trunk/user/vsftpd/{ => src}/main.c | 0 trunk/user/vsftpd/{ => src}/netstr.c | 0 trunk/user/vsftpd/{ => src}/netstr.h | 0 trunk/user/vsftpd/{ => src}/oneprocess.c | 0 trunk/user/vsftpd/{ => src}/oneprocess.h | 0 trunk/user/vsftpd/{ => src}/opts.c | 0 trunk/user/vsftpd/{ => src}/opts.h | 0 trunk/user/vsftpd/{ => src}/parseconf.c | 0 trunk/user/vsftpd/{ => src}/parseconf.h | 0 trunk/user/vsftpd/{ => src}/port/aix_bogons.h | 0 .../user/vsftpd/{ => src}/port/cmsg_extras.h | 0 .../user/vsftpd/{ => src}/port/dirfd_extras.h | 0 .../user/vsftpd/{ => src}/port/hpux_bogons.h | 0 .../user/vsftpd/{ => src}/port/irix_bogons.h | 0 .../user/vsftpd/{ => src}/port/porting_junk.h | 0 .../vsftpd/{ => src}/port/solaris_bogons.h | 0 .../user/vsftpd/{ => src}/port/tru64_bogons.h | 0 trunk/user/vsftpd/{ => src}/postlogin.c | 0 trunk/user/vsftpd/{ => src}/postlogin.h | 0 trunk/user/vsftpd/{ => src}/postprivparent.c | 0 trunk/user/vsftpd/{ => src}/postprivparent.h | 0 trunk/user/vsftpd/{ => src}/prelogin.c | 0 trunk/user/vsftpd/{ => src}/prelogin.h | 0 trunk/user/vsftpd/{ => src}/privops.c | 0 trunk/user/vsftpd/{ => src}/privops.h | 0 trunk/user/vsftpd/{ => src}/privsock.c | 0 trunk/user/vsftpd/{ => src}/privsock.h | 0 trunk/user/vsftpd/{ => src}/ptracesandbox.c | 0 trunk/user/vsftpd/{ => src}/ptracesandbox.h | 0 trunk/user/vsftpd/{ => src}/readwrite.c | 0 trunk/user/vsftpd/{ => src}/readwrite.h | 0 trunk/user/vsftpd/{ => src}/secbuf.c | 0 trunk/user/vsftpd/{ => src}/secbuf.h | 0 trunk/user/vsftpd/{ => src}/seccompsandbox.c | 0 trunk/user/vsftpd/{ => src}/seccompsandbox.h | 0 trunk/user/vsftpd/{ => src}/secutil.c | 0 trunk/user/vsftpd/{ => src}/secutil.h | 0 trunk/user/vsftpd/{ => src}/session.h | 0 trunk/user/vsftpd/{ => src}/ssl.c | 0 trunk/user/vsftpd/{ => src}/ssl.h | 0 trunk/user/vsftpd/{ => src}/sslslave.c | 0 trunk/user/vsftpd/{ => src}/sslslave.h | 0 trunk/user/vsftpd/{ => src}/standalone.c | 0 trunk/user/vsftpd/{ => src}/standalone.h | 0 trunk/user/vsftpd/{ => src}/str.c | 0 trunk/user/vsftpd/{ => src}/str.h | 0 trunk/user/vsftpd/{ => src}/strlist.c | 0 trunk/user/vsftpd/{ => src}/strlist.h | 0 trunk/user/vsftpd/{ => src}/sysdeputil.c | 0 trunk/user/vsftpd/{ => src}/sysdeputil.h | 0 trunk/user/vsftpd/{ => src}/sysstr.c | 0 trunk/user/vsftpd/{ => src}/sysstr.h | 0 trunk/user/vsftpd/{ => src}/sysutil.c | 0 trunk/user/vsftpd/{ => src}/sysutil.h | 0 trunk/user/vsftpd/{ => src}/tcpwrap.c | 0 trunk/user/vsftpd/{ => src}/tcpwrap.h | 0 trunk/user/vsftpd/{ => src}/tunables.c | 0 trunk/user/vsftpd/{ => src}/tunables.h | 0 trunk/user/vsftpd/{ => src}/twoprocess.c | 0 trunk/user/vsftpd/{ => src}/twoprocess.h | 0 trunk/user/vsftpd/{ => src}/utility.c | 0 trunk/user/vsftpd/{ => src}/utility.h | 0 trunk/user/vsftpd/{ => src}/vsf_findlibs.sh | 0 trunk/user/vsftpd/{ => src}/vsftpd.8 | 0 trunk/user/vsftpd/{ => src}/vsftpd.conf | 0 trunk/user/vsftpd/{ => src}/vsftpd.conf.5 | 0 trunk/user/vsftpd/{ => src}/vsftpver.h | 0 trunk/user/vsftpd/xinetd.d/vsftpd | 18 - trunk/user/wsdd2/Makefile | 24 +- trunk/user/wsdd2/src/Makefile | 13 + trunk/user/wsdd2/{ => src}/llmnr.c | 0 trunk/user/wsdd2/{ => src}/wsd.c | 0 trunk/user/wsdd2/{ => src}/wsd.h | 0 trunk/user/wsdd2/{ => src}/wsdd.h | 0 trunk/user/wsdd2/{ => src}/wsdd2.c | 0 trunk/user/www/Makefile | 2 +- 673 files changed, 2263 insertions(+), 2169 deletions(-) delete mode 100644 trunk/user/LPRng/Makefile.in delete mode 100644 trunk/user/LPRng/mkinstalldirs rename trunk/user/LPRng/{ => src}/ABOUT-NLS (100%) rename trunk/user/LPRng/{ => src}/ABOUT-NLS.LPRng (100%) rename trunk/user/LPRng/{ => src}/CHANGES (100%) rename trunk/user/LPRng/{ => src}/CONFIG_JW (100%) rename trunk/user/LPRng/{ => src}/CONTRIBUTORS (100%) rename trunk/user/LPRng/{ => src}/COPYRIGHT (100%) rename trunk/user/LPRng/{ => src}/CREATE_CONFIGURE (100%) rename trunk/user/LPRng/{ => src}/ChangeLog (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/BSDI/Makefile (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/LPRng-3.8.22.tbz (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile.build (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/distinfo (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/files-pkg-message (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-deinstall (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-descr (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-install (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-message (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-plist (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Makefile (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Makefile,v (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Makefile.in (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/README (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/RPM.RedHat/LPRng.spec (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/RPM.RedHat/Makefile (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/RPM.RedHat/UNPACK (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/RPM.RedHat/lpd.init (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/Makefile (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/README (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/UNPACK (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/copyright (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/i.preserve (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/inetd.conf (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/prototype.pre (100%) rename trunk/user/LPRng/{ => src}/DISTRIBUTIONS/Solaris.pkg/r.preserve (100%) rename trunk/user/LPRng/{ => src}/INSTALL (100%) rename trunk/user/LPRng/{ => src}/KERBEROS_configuration (100%) rename trunk/user/LPRng/{ => src}/LICENSE (100%) rename trunk/user/LPRng/{ => src}/LINK (100%) rename trunk/user/LPRng/{ => src}/MIRRORS (100%) rename trunk/user/LPRng/{ => src}/MIT_configure (100%) rename trunk/user/LPRng/{ => src}/README (100%) rename trunk/user/LPRng/{ => src}/README.SSL.SECURITY (100%) rename trunk/user/LPRng/{ => src}/README.ports (100%) rename trunk/user/LPRng/{ => src}/STANDARD_configuration (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/accnt (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA001taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA002taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA003taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA004taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA007taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA067taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA070taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA335taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA343taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA637taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA672taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/cfA692taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA001taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA002taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA004taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA007taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA067taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA070taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA335taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA343taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA506taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA517taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA637taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA672taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/dfA692taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/hfA335taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/hfA637taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/log (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/printcap (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t1/t1 (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t2/cfA335taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t2/dfA335taco (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t2/log (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/LPD/t2/t2 (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/Makefile (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/Makefile.in (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/README (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/bqfilter.sh (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/clearlog (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/common.conf.proto (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/control_filter (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/dbserver.sh (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/filter (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/filter.sh (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/lpd.conf.proto (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/lpd.perms.proto (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/lpd_printcap.proto (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/makedb (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/mkinstalldirs (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/printcap.proto (100%) rename trunk/user/LPRng/{ => src}/TESTSUPPORT/router.sh (100%) rename trunk/user/LPRng/{ => src}/TODO (100%) rename trunk/user/LPRng/{ => src}/TopLevelMakefile (100%) rename trunk/user/LPRng/{ => src}/UPDATE (100%) rename trunk/user/LPRng/{ => src}/UTILS/CIFAST (100%) rename trunk/user/LPRng/{ => src}/UTILS/LPRng.pm (100%) rename trunk/user/LPRng/{ => src}/UTILS/LPRng.pm.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/Makefile (100%) rename trunk/user/LPRng/{ => src}/UTILS/Makefile.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/README (100%) rename trunk/user/LPRng/{ => src}/UTILS/README.ForKerberosHackers (100%) rename trunk/user/LPRng/{ => src}/UTILS/accounting.pl (100%) rename trunk/user/LPRng/{ => src}/UTILS/accounting.pl.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/atalkprint (100%) rename trunk/user/LPRng/{ => src}/UTILS/chooser.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/decode_args_with_perl (100%) rename trunk/user/LPRng/{ => src}/UTILS/decode_args_with_perl.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/decode_args_with_sh (100%) rename trunk/user/LPRng/{ => src}/UTILS/decode_args_with_sh.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/fixid (100%) rename trunk/user/LPRng/{ => src}/UTILS/fixid.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/fixupdate (100%) rename trunk/user/LPRng/{ => src}/UTILS/fixupdate.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/freefs.c (100%) rename trunk/user/LPRng/{ => src}/UTILS/hello.ps (100%) rename trunk/user/LPRng/{ => src}/UTILS/linetest.c (100%) rename trunk/user/LPRng/{ => src}/UTILS/lpq_in_perl (100%) rename trunk/user/LPRng/{ => src}/UTILS/lpq_in_perl.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/lpr_in_perl (100%) rename trunk/user/LPRng/{ => src}/UTILS/lpr_in_perl.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/lprm_in_perl (100%) rename trunk/user/LPRng/{ => src}/UTILS/lprm_in_perl.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/make_lpd_conf (100%) rename trunk/user/LPRng/{ => src}/UTILS/make_lpd_conf.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/make_printcap_use (100%) rename trunk/user/LPRng/{ => src}/UTILS/make_printcap_use.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/makeinc (100%) rename trunk/user/LPRng/{ => src}/UTILS/makeinc.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/ncpprint (100%) rename trunk/user/LPRng/{ => src}/UTILS/one.pcl (100%) rename trunk/user/LPRng/{ => src}/UTILS/one.pjl (100%) rename trunk/user/LPRng/{ => src}/UTILS/one.ps (100%) rename trunk/user/LPRng/{ => src}/UTILS/read_conf (100%) rename trunk/user/LPRng/{ => src}/UTILS/read_conf.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/remote_active (100%) rename trunk/user/LPRng/{ => src}/UTILS/remote_active.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/set_file_time (100%) rename trunk/user/LPRng/{ => src}/UTILS/set_file_time.c (100%) rename trunk/user/LPRng/{ => src}/UTILS/smbprint (100%) rename trunk/user/LPRng/{ => src}/UTILS/tcpsend.c (100%) rename trunk/user/LPRng/{ => src}/UTILS/termcap.c (100%) rename trunk/user/LPRng/{ => src}/UTILS/test_read (100%) rename trunk/user/LPRng/{ => src}/UTILS/test_read.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/test_rw_pipe.c (100%) rename trunk/user/LPRng/{ => src}/UTILS/testpr (100%) rename trunk/user/LPRng/{ => src}/UTILS/update_z.pl (100%) rename trunk/user/LPRng/{ => src}/UTILS/update_z.pl.in (100%) rename trunk/user/LPRng/{ => src}/UTILS/xlate.c (100%) rename trunk/user/LPRng/{ => src}/VERSION (100%) rename trunk/user/LPRng/{ => src}/Y2KCompliance (100%) rename trunk/user/LPRng/{ => src}/acinclude.m4 (100%) rename trunk/user/LPRng/{ => src}/aclocal.m4 (100%) rename trunk/user/LPRng/{ => src}/asus_README (100%) rename trunk/user/LPRng/{ => src}/config.guess (100%) rename trunk/user/LPRng/{ => src}/config.h (100%) rename trunk/user/LPRng/{ => src}/config.h.in (100%) rename trunk/user/LPRng/{ => src}/config.rpath (100%) rename trunk/user/LPRng/{ => src}/config.sub (100%) rename trunk/user/LPRng/{ => src}/configure (100%) rename trunk/user/LPRng/{ => src}/configure.in (100%) rename trunk/user/LPRng/{ => src}/hfA018 (100%) rename trunk/user/LPRng/{ => src}/init.freebsd.sh (100%) rename trunk/user/LPRng/{ => src}/init.linux.sh (100%) rename trunk/user/LPRng/{ => src}/init.linuxsb.sh (100%) rename trunk/user/LPRng/{ => src}/init.redhat.sh (100%) rename trunk/user/LPRng/{ => src}/init.solaris.sh (100%) rename trunk/user/LPRng/{ => src}/libtool (100%) rename trunk/user/LPRng/{ => src}/lpd.perms (100%) rename trunk/user/LPRng/{ => src}/lpd.perms.in (100%) rename trunk/user/LPRng/{ => src}/lpd_STATFS (100%) rename trunk/user/LPRng/{ => src}/ltconfig (100%) rename trunk/user/LPRng/{ => src}/ltmain.sh (100%) rename trunk/user/LPRng/{ => src}/man/Makefile (100%) rename trunk/user/LPRng/{ => src}/man/Makefile.in (100%) rename trunk/user/LPRng/{ => src}/man/README (100%) rename trunk/user/LPRng/{ => src}/man/cancel.n (100%) rename trunk/user/LPRng/{ => src}/man/checkpc.n (100%) rename trunk/user/LPRng/{ => src/man}/install-sh (100%) rename trunk/user/LPRng/{ => src}/man/lp.n (100%) rename trunk/user/LPRng/{ => src}/man/lpbanner.n (100%) rename trunk/user/LPRng/{ => src}/man/lpc.n (100%) rename trunk/user/LPRng/{ => src}/man/lpd.conf.n (100%) rename trunk/user/LPRng/{ => src}/man/lpd.n (100%) rename trunk/user/LPRng/{ => src}/man/lpd.perms.n (100%) rename trunk/user/LPRng/{ => src}/man/lpf.n (100%) rename trunk/user/LPRng/{ => src}/man/lpq.n (100%) rename trunk/user/LPRng/{ => src}/man/lpr.n (100%) rename trunk/user/LPRng/{ => src}/man/lprm.n (100%) rename trunk/user/LPRng/{ => src}/man/lprng_certs.n (100%) rename trunk/user/LPRng/{ => src}/man/lprng_index_certs.n (100%) rename trunk/user/LPRng/{ => src}/man/lpstat.n (100%) rename trunk/user/LPRng/{ => src}/man/mkinstalldirs (100%) rename trunk/user/LPRng/{ => src}/man/monitor.n (100%) rename trunk/user/LPRng/{ => src}/man/pclbanner.n (100%) rename trunk/user/LPRng/{ => src}/man/printcap.n (100%) rename trunk/user/LPRng/{ => src}/man/psbanner.n (100%) rename trunk/user/LPRng/{ => src}/po/ChangeLog (100%) rename trunk/user/LPRng/{ => src}/po/LPRng.pot (100%) rename trunk/user/LPRng/{ => src}/po/Makefile (100%) rename trunk/user/LPRng/{ => src}/po/Makefile.in (100%) rename trunk/user/LPRng/{ => src}/po/Makefile.in.in (100%) rename trunk/user/LPRng/{ => src}/po/Makevars (100%) rename trunk/user/LPRng/{ => src}/po/POTFILES (100%) rename trunk/user/LPRng/{ => src}/po/POTFILES.in (100%) rename trunk/user/LPRng/{ => src}/po/Rules-quot (100%) rename trunk/user/LPRng/{ => src}/po/boldquot.sed (100%) rename trunk/user/LPRng/{ => src}/po/en@boldquot.header (100%) rename trunk/user/LPRng/{ => src}/po/en@quot.header (100%) rename trunk/user/LPRng/{ => src}/po/fr.gmo (100%) rename trunk/user/LPRng/{ => src}/po/fr.po (100%) rename trunk/user/LPRng/{ => src}/po/insert-header.sin (100%) rename trunk/user/LPRng/{ => src}/po/quot.sed (100%) rename trunk/user/LPRng/{ => src}/po/remove-potcdate.sed (100%) rename trunk/user/LPRng/{ => src}/po/remove-potcdate.sin (100%) rename trunk/user/LPRng/{ => src}/postinstall.freebsd.sh (100%) rename trunk/user/LPRng/{ => src}/postinstall.generic.sh (100%) rename trunk/user/LPRng/{ => src}/postinstall.linux.sh (100%) rename trunk/user/LPRng/{ => src}/postinstall.solaris.sh (100%) rename trunk/user/LPRng/{ => src}/postremove.generic.sh (100%) rename trunk/user/LPRng/{ => src}/postremove.solaris.sh (100%) rename trunk/user/LPRng/{ => src}/preinstall.solaris.sh (100%) rename trunk/user/LPRng/{ => src}/preremove.freebsd.sh (100%) rename trunk/user/LPRng/{ => src}/preremove.generic.sh (100%) rename trunk/user/LPRng/{ => src}/preremove.linux.sh (100%) rename trunk/user/LPRng/{ => src}/preremove.solaris.sh (100%) rename trunk/user/LPRng/{ => src}/printcap (100%) rename trunk/user/LPRng/{ => src}/printer.c (100%) rename trunk/user/LPRng/src/{ => src}/.cfg (100%) rename trunk/user/LPRng/src/{ => src}/AUTHENTICATE/sclient.c (100%) rename trunk/user/LPRng/src/{ => src}/AUTHENTICATE/sserver.c (100%) create mode 100644 trunk/user/LPRng/src/src/Makefile rename trunk/user/LPRng/src/{ => src}/Makefile.brcm (100%) create mode 100644 trunk/user/LPRng/src/src/Makefile.in rename trunk/user/LPRng/src/{ => src}/common/accounting.c (100%) rename trunk/user/LPRng/src/{ => src}/common/checkpc.c (100%) rename trunk/user/LPRng/src/{ => src}/common/child.c (100%) rename trunk/user/LPRng/src/{ => src}/common/controlword.c (100%) rename trunk/user/LPRng/src/{ => src}/common/copyright.c (100%) rename trunk/user/LPRng/src/{ => src}/common/debug.c (100%) rename trunk/user/LPRng/src/{ => src}/common/errormsg.c (100%) rename trunk/user/LPRng/src/{ => src}/common/fileopen.c (100%) rename trunk/user/LPRng/src/{ => src}/common/gethostinfo.c (100%) rename trunk/user/LPRng/src/{ => src}/common/getopt.c (100%) rename trunk/user/LPRng/src/{ => src}/common/getprinter.c (100%) rename trunk/user/LPRng/src/{ => src}/common/getqueue.c (100%) rename trunk/user/LPRng/src/{ => src}/common/globmatch.c (100%) rename trunk/user/LPRng/src/{ => src}/common/initialize.c (100%) rename trunk/user/LPRng/src/{ => src}/common/krb5_auth.c (100%) rename trunk/user/LPRng/src/{ => src}/common/linelist.c (100%) rename trunk/user/LPRng/src/{ => src}/common/linksupport.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lockfile.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpbanner.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpc.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_control.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_dispatch.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_jobs.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_lisa.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_logger.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_rcvjob.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_remove.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_secure.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpd_status.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpf.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpq.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpr.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lprm.c (100%) rename trunk/user/LPRng/src/{ => src}/common/lpstat.c (100%) rename trunk/user/LPRng/src/{ => src}/common/md5.c (100%) rename trunk/user/LPRng/src/{ => src}/common/merge.c (100%) rename trunk/user/LPRng/src/{ => src}/common/monitor.c (100%) rename trunk/user/LPRng/src/{ => src}/common/permission.c (100%) rename trunk/user/LPRng/src/{ => src}/common/plp_snprintf.c (100%) rename trunk/user/LPRng/src/{ => src}/common/printjob.c (100%) rename trunk/user/LPRng/src/{ => src}/common/proctitle.c (100%) rename trunk/user/LPRng/src/{ => src}/common/sendauth.c (100%) rename trunk/user/LPRng/src/{ => src}/common/sendjob.c (100%) rename trunk/user/LPRng/src/{ => src}/common/sendmail.c (100%) rename trunk/user/LPRng/src/{ => src}/common/sendreq.c (100%) rename trunk/user/LPRng/src/{ => src}/common/ssl_auth.c (100%) rename trunk/user/LPRng/src/{ => src}/common/stty.c (100%) rename trunk/user/LPRng/src/{ => src}/common/user_auth.c (100%) rename trunk/user/LPRng/src/{ => src}/common/user_objs.c (100%) rename trunk/user/LPRng/src/{ => src}/common/utilities.c (100%) rename trunk/user/LPRng/src/{ => src}/common/vars.c (100%) rename trunk/user/LPRng/src/{ => src}/fixupdate (100%) rename trunk/user/LPRng/src/{ => src}/freefs.c (100%) rename trunk/user/LPRng/src/{ => src}/include/accounting.h (100%) rename trunk/user/LPRng/src/{ => src}/include/checkpc.h (100%) rename trunk/user/LPRng/src/{ => src}/include/child.h (100%) rename trunk/user/LPRng/src/{ => src}/include/control.h (100%) rename trunk/user/LPRng/src/{ => src}/include/copyright.h (100%) rename trunk/user/LPRng/src/{ => src}/include/debug.h (100%) rename trunk/user/LPRng/src/{ => src}/include/errorcodes.h (100%) rename trunk/user/LPRng/src/{ => src}/include/errormsg.h (100%) rename trunk/user/LPRng/src/{ => src}/include/fileopen.h (100%) rename trunk/user/LPRng/src/{ => src}/include/gethostinfo.h (100%) rename trunk/user/LPRng/src/{ => src}/include/getopt.h (100%) rename trunk/user/LPRng/src/{ => src}/include/getprinter.h (100%) rename trunk/user/LPRng/src/{ => src}/include/getqueue.h (100%) rename trunk/user/LPRng/src/{ => src}/include/globmatch.h (100%) rename trunk/user/LPRng/src/{ => src}/include/initialize.h (100%) rename trunk/user/LPRng/src/{ => src}/include/krb5_auth.h (100%) rename trunk/user/LPRng/src/{ => src}/include/license.h (100%) rename trunk/user/LPRng/src/{ => src}/include/linelist.h (100%) rename trunk/user/LPRng/src/{ => src}/include/linksupport.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lockfile.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lp.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lp_asus.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpc.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_control.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_dispatch.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_jobs.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_logger.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_rcvjob.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_remove.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_secure.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpd_status.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpq.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpr.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lprm.h (100%) rename trunk/user/LPRng/src/{ => src}/include/lpstat.h (100%) rename trunk/user/LPRng/src/{ => src}/include/md5.h (100%) rename trunk/user/LPRng/src/{ => src}/include/merge.h (100%) rename trunk/user/LPRng/src/{ => src}/include/patchlevel.h (100%) rename trunk/user/LPRng/src/{ => src}/include/permission.h (100%) rename trunk/user/LPRng/src/{ => src}/include/plp_snprintf.h (100%) rename trunk/user/LPRng/src/{ => src}/include/portable.h (100%) rename trunk/user/LPRng/src/{ => src}/include/printjob.h (100%) rename trunk/user/LPRng/src/{ => src}/include/proctitle.h (100%) rename trunk/user/LPRng/src/{ => src}/include/readstatus.h (100%) rename trunk/user/LPRng/src/{ => src}/include/sendauth.h (100%) rename trunk/user/LPRng/src/{ => src}/include/sendjob.h (100%) rename trunk/user/LPRng/src/{ => src}/include/sendmail.h (100%) rename trunk/user/LPRng/src/{ => src}/include/sendreq.h (100%) rename trunk/user/LPRng/src/{ => src}/include/ssl_auth.h (100%) rename trunk/user/LPRng/src/{ => src}/include/stty.h (100%) rename trunk/user/LPRng/src/{ => src}/include/user_auth.h (100%) rename trunk/user/LPRng/src/{ => src}/include/user_objs.h (100%) rename trunk/user/LPRng/src/{ => src}/include/utilities.h (100%) rename trunk/user/LPRng/src/{ => src}/include/wlancom.h (100%) rename trunk/user/LPRng/{man => src/src}/install-sh (100%) rename trunk/user/LPRng/src/{ => src}/lprng_certs.sh (100%) rename trunk/user/LPRng/src/{ => src}/lprng_index_certs.sh (100%) create mode 100644 trunk/user/LPRng/src/src/mkinstalldirs rename trunk/user/LPRng/src/{ => src}/pclbanner (100%) rename trunk/user/LPRng/src/{ => src}/pclbanner.in (100%) rename trunk/user/LPRng/src/{ => src}/psbanner (100%) rename trunk/user/LPRng/src/{ => src}/psbanner.in (100%) rename trunk/user/LPRng/{ => src}/working_binaries/lpd (100%) rename trunk/user/LPRng/{ => src}/working_binaries/lpd_usbonly (100%) rename trunk/user/LPRng/{ => src}/working_binaries/printer.c (100%) rename trunk/user/LPRng/{ => src}/working_binaries/printer.o.rename (100%) rename trunk/user/{shared => }/boards.mk (96%) rename trunk/user/{shared => }/cflags.mk (100%) create mode 100644 trunk/user/httpd/src/Makefile rename trunk/user/httpd/{ => src}/aidisk.c (100%) rename trunk/user/httpd/{ => src}/aspbw.c (100%) rename trunk/user/httpd/{ => src}/base64.c (100%) rename trunk/user/httpd/{ => src}/cgi.c (100%) rename trunk/user/httpd/{ => src}/common.c (100%) rename trunk/user/httpd/{ => src}/common.h (100%) rename trunk/user/httpd/{ => src}/crc32.c (100%) rename trunk/user/httpd/{ => src}/dbapi.c (100%) rename trunk/user/httpd/{ => src}/dbapi.h (100%) rename trunk/user/httpd/{ => src}/ej.c (100%) rename trunk/user/httpd/{ => src}/httpd.c (100%) rename trunk/user/httpd/{ => src}/httpd.h (100%) rename trunk/user/httpd/{ => src}/https.c (100%) rename trunk/user/httpd/{ => src}/image.h (100%) rename trunk/user/httpd/{ => src}/initial_web_hook.c (100%) rename trunk/user/httpd/{ => src}/nvram_x.c (100%) rename trunk/user/httpd/{ => src}/nvram_x.h (100%) rename trunk/user/httpd/{ => src}/ralink.c (100%) rename trunk/user/httpd/{ => src}/switch_mtk_esw.c (100%) rename trunk/user/httpd/{ => src}/switch_rtl8367.c (100%) rename trunk/user/httpd/{ => src}/tdate_parse.c (100%) rename trunk/user/httpd/{ => src}/upload.c (100%) rename trunk/user/httpd/{ => src}/variables.c (100%) rename trunk/user/httpd/{ => src}/web_ex.c (100%) create mode 100644 trunk/user/infosvr/src/Makefile rename trunk/user/infosvr/{ => src}/asus.c (98%) rename trunk/user/infosvr/{ => src}/infosvr.c (99%) rename trunk/user/infosvr/{ => src}/infosvr.h (100%) create mode 100644 trunk/user/libdisk/src/Makefile rename trunk/user/libdisk/{ => src}/dev_info.c (100%) rename trunk/user/libdisk/{ => src}/dev_info.h (100%) rename trunk/user/libdisk/{ => src}/disk_initial.c (99%) rename trunk/user/libdisk/{ => src}/disk_initial.h (100%) rename trunk/user/libdisk/{ => src}/disk_io_tools.c (100%) rename trunk/user/libdisk/{ => src}/disk_io_tools.h (100%) rename trunk/user/libdisk/{ => src}/disk_share.c (100%) rename trunk/user/libdisk/{ => src}/disk_share.h (100%) rename trunk/user/libdisk/{ => src}/disk_test.c (100%) rename trunk/user/libdisk/{ => src}/test_share.c (100%) rename trunk/user/libdisk/{ => src}/usb_info.c (99%) rename trunk/user/libdisk/{ => src}/usb_info.h (100%) delete mode 100644 trunk/user/lldt/icon.large.ico create mode 100644 trunk/user/networkmap/src/Makefile rename trunk/user/networkmap/{ => src}/function.c (99%) rename trunk/user/networkmap/{ => src}/networkmap.c (100%) rename trunk/user/networkmap/{ => src}/networkmap.h (98%) create mode 100644 trunk/user/nvram/src/Makefile rename trunk/user/nvram/{ => src}/nvram.c (100%) create mode 100644 trunk/user/rc/src/Makefile rename trunk/user/rc/{ => src}/auth.c (100%) rename trunk/user/rc/{ => src}/btn_action.c (100%) rename trunk/user/rc/{ => src}/common_ex.c (100%) rename trunk/user/rc/{ => src}/detect_internet.c (100%) rename trunk/user/rc/{ => src}/detect_link.c (100%) rename trunk/user/rc/{ => src}/detect_wan.c (100%) rename trunk/user/rc/{ => src}/firewall_ex.c (100%) rename trunk/user/rc/{ => src}/gpio_btn.c (100%) rename trunk/user/rc/{ => src}/gpio_pins.c (100%) rename trunk/user/rc/{ => src}/gpio_pins.h (100%) rename trunk/user/rc/{ => src}/hotplug_stor.c (100%) rename trunk/user/rc/{ => src}/hotplug_usb.c (100%) rename trunk/user/rc/{ => src}/inicd.c (100%) rename trunk/user/rc/{ => src}/init.c (100%) rename trunk/user/rc/{ => src}/net.c (100%) rename trunk/user/rc/{ => src}/net6.c (100%) rename trunk/user/rc/{ => src}/net_lan.c (100%) rename trunk/user/rc/{ => src}/net_lan6.c (100%) rename trunk/user/rc/{ => src}/net_ppp.c (100%) rename trunk/user/rc/{ => src}/net_wan.c (100%) rename trunk/user/rc/{ => src}/net_wan6.c (100%) rename trunk/user/rc/{ => src}/net_wifi.c (100%) rename trunk/user/rc/{ => src}/ralink.c (100%) rename trunk/user/rc/{ => src}/rc.c (100%) rename trunk/user/rc/{ => src}/rc.h (100%) rename trunk/user/rc/{ => src}/rstats.c (99%) rename trunk/user/rc/{ => src}/services.c (100%) rename trunk/user/rc/{ => src}/services_ex.c (100%) rename trunk/user/rc/{ => src}/services_stor.c (100%) rename trunk/user/rc/{ => src}/services_usb.c (100%) rename trunk/user/rc/{ => src}/smp.c (100%) rename trunk/user/rc/{ => src}/switch.h (100%) rename trunk/user/rc/{ => src}/switch_mtk_esw.c (100%) rename trunk/user/rc/{ => src}/switch_rtl8367.c (100%) rename trunk/user/rc/{ => src}/usb_modem.c (100%) rename trunk/user/rc/{ => src}/vpn_client.c (100%) rename trunk/user/rc/{ => src}/vpn_openvpn.c (100%) rename trunk/user/rc/{ => src}/vpn_server.c (100%) rename trunk/user/rc/{ => src}/watchdog.c (100%) delete mode 100644 trunk/user/shared/.gitignore create mode 100644 trunk/user/shared/src/Makefile rename trunk/user/shared/{ => src}/bin_sem_asus.c (100%) rename trunk/user/shared/{ => src}/bin_sem_asus.h (100%) rename trunk/user/shared/{ => src}/defaults.c (100%) rename trunk/user/shared/{ => src}/defaults.h (100%) rename trunk/user/shared/{ => src}/flash_mtd.c (100%) rename trunk/user/shared/{ => src}/flash_mtd.h (100%) rename trunk/user/shared/{ => src}/gpioutils.c (100%) rename trunk/user/shared/{ => src}/gpioutils.h (100%) create mode 100644 trunk/user/shared/src/include/.gitignore rename trunk/user/shared/{ => src}/include/bsd_queue.h (100%) rename trunk/user/shared/{ => src}/include/ibox.h (100%) rename trunk/user/shared/{ => src}/include/mtd-abi.h (100%) rename trunk/user/shared/{ => src}/include/ralink_boards.h (100%) rename trunk/user/shared/{ => src}/include/ralink_priv.h (100%) rename trunk/user/shared/{ => src}/netutils.c (100%) rename trunk/user/shared/{ => src}/netutils.h (100%) rename trunk/user/shared/{ => src}/notify_rc.c (100%) rename trunk/user/shared/{ => src}/notify_rc.h (100%) rename trunk/user/shared/{ => src}/nvram_linux.c (100%) rename trunk/user/shared/{ => src}/nvram_linux.h (100%) rename trunk/user/shared/{ => src}/pids.c (100%) rename trunk/user/shared/{ => src}/rstats.h (100%) rename trunk/user/shared/{ => src}/rtutils.c (100%) rename trunk/user/shared/{ => src}/rtutils.h (100%) rename trunk/user/shared/{ => src}/shutils.c (100%) rename trunk/user/shared/{ => src}/shutils.h (100%) create mode 100644 trunk/user/u2ec/src/Makefile rename trunk/user/u2ec/{ => src}/debug.c (100%) rename trunk/user/u2ec/{ => src}/decode.c (100%) rename trunk/user/u2ec/{ => src}/decode.h (100%) rename trunk/user/u2ec/{ => src}/poppack.h (100%) rename trunk/user/u2ec/{ => src}/pshpack1.h (100%) rename trunk/user/u2ec/{ => src}/testusb.c (100%) rename trunk/user/u2ec/{ => src}/typeconvert.h (100%) rename trunk/user/u2ec/{ => src}/u2ec_list.h (100%) rename trunk/user/u2ec/{ => src}/urb.h (100%) rename trunk/user/u2ec/{ => src}/urb64.h (100%) rename trunk/user/u2ec/{ => src}/usb.h (84%) rename trunk/user/u2ec/{ => src}/usb100.h (100%) rename trunk/user/u2ec/{ => src}/usbdi.h (100%) rename trunk/user/u2ec/{ => src}/usbioctl.h (100%) rename trunk/user/u2ec/{ => src}/usbiodef.h (100%) rename trunk/user/u2ec/{ => src}/usbsock.c (100%) rename trunk/user/u2ec/{ => src}/usbsock.h (100%) rename trunk/user/u2ec/{ => src}/wdm-MJMN.h (100%) rename trunk/user/vsftpd/{ => src}/AUDIT (100%) rename trunk/user/vsftpd/{ => src}/BENCHMARKS (100%) rename trunk/user/vsftpd/{ => src}/BUGS (100%) rename trunk/user/vsftpd/{ => src}/COPYING (100%) rename trunk/user/vsftpd/{ => src}/COPYRIGHT (100%) rename trunk/user/vsftpd/{ => src}/Changelog (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/INTERNET_SITE/README (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/INTERNET_SITE/vsftpd.conf (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/INTERNET_SITE/vsftpd.xinetd (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/INTERNET_SITE_NOINETD/README (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/PER_IP_CONFIG/README (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/PER_IP_CONFIG/hosts.allow (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/README (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/VIRTUAL_HOSTS/README (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/VIRTUAL_USERS/README (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/VIRTUAL_USERS/logins.txt (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/VIRTUAL_USERS/vsftpd.conf (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/VIRTUAL_USERS/vsftpd.pam (100%) rename trunk/user/vsftpd/{ => src}/EXAMPLE/VIRTUAL_USERS_2/README (100%) rename trunk/user/vsftpd/{ => src}/FAQ (100%) rename trunk/user/vsftpd/{ => src}/INSTALL (100%) rename trunk/user/vsftpd/{ => src}/LICENSE (100%) create mode 100644 trunk/user/vsftpd/src/Makefile rename trunk/user/vsftpd/{ => src}/README (100%) rename trunk/user/vsftpd/{ => src}/README.security (100%) rename trunk/user/vsftpd/{ => src}/README.ssl (100%) rename trunk/user/vsftpd/{ => src}/REFS (100%) rename trunk/user/vsftpd/{ => src}/REWARD (100%) rename trunk/user/vsftpd/{ => src}/RedHat/README.spec (100%) rename trunk/user/vsftpd/{ => src}/RedHat/vsftpd.log (100%) rename trunk/user/vsftpd/{ => src}/RedHat/vsftpd.pam (100%) rename trunk/user/vsftpd/{ => src}/SECURITY/DESIGN (100%) rename trunk/user/vsftpd/{ => src}/SECURITY/IMPLEMENTATION (100%) rename trunk/user/vsftpd/{ => src}/SECURITY/OVERVIEW (100%) rename trunk/user/vsftpd/{ => src}/SECURITY/TRUST (100%) rename trunk/user/vsftpd/{ => src}/SIZE (100%) rename trunk/user/vsftpd/{ => src}/SPEED (100%) rename trunk/user/vsftpd/{ => src}/TODO (100%) rename trunk/user/vsftpd/{ => src}/TUNING (100%) rename trunk/user/vsftpd/{ => src}/access.c (100%) rename trunk/user/vsftpd/{ => src}/access.h (100%) rename trunk/user/vsftpd/{ => src}/ascii.c (100%) rename trunk/user/vsftpd/{ => src}/ascii.h (100%) rename trunk/user/vsftpd/{ => src}/asus_ext.c (100%) rename trunk/user/vsftpd/{ => src}/asus_ext.h (100%) rename trunk/user/vsftpd/{ => src}/banner.c (100%) rename trunk/user/vsftpd/{ => src}/banner.h (100%) rename trunk/user/vsftpd/{ => src}/builddefs.h (100%) rename trunk/user/vsftpd/{ => src}/defs.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/crypt.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/openssl/ssl.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/security/pam_appl.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/shadow.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/sys/capability.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/sys/prctl.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/sys/sendfile.h (100%) rename trunk/user/vsftpd/{ => src}/dummyinc/utmpx.h (100%) rename trunk/user/vsftpd/{ => src}/features.c (100%) rename trunk/user/vsftpd/{ => src}/features.h (100%) rename trunk/user/vsftpd/{ => src}/filesize.h (100%) rename trunk/user/vsftpd/{ => src}/filestr.c (100%) rename trunk/user/vsftpd/{ => src}/filestr.h (100%) rename trunk/user/vsftpd/{ => src}/ftpcmdio.c (100%) rename trunk/user/vsftpd/{ => src}/ftpcmdio.h (100%) rename trunk/user/vsftpd/{ => src}/ftpcodes.h (100%) rename trunk/user/vsftpd/{ => src}/ftpdataio.c (100%) rename trunk/user/vsftpd/{ => src}/ftpdataio.h (100%) rename trunk/user/vsftpd/{ => src}/ftppolicy.c (100%) rename trunk/user/vsftpd/{ => src}/ftppolicy.h (100%) rename trunk/user/vsftpd/{ => src}/hash.c (100%) rename trunk/user/vsftpd/{ => src}/hash.h (100%) rename trunk/user/vsftpd/{ => src}/ipaddrparse.c (100%) rename trunk/user/vsftpd/{ => src}/ipaddrparse.h (100%) rename trunk/user/vsftpd/{ => src}/logging.c (100%) rename trunk/user/vsftpd/{ => src}/logging.h (100%) rename trunk/user/vsftpd/{ => src}/ls.c (100%) rename trunk/user/vsftpd/{ => src}/ls.h (100%) rename trunk/user/vsftpd/{ => src}/main.c (100%) rename trunk/user/vsftpd/{ => src}/netstr.c (100%) rename trunk/user/vsftpd/{ => src}/netstr.h (100%) rename trunk/user/vsftpd/{ => src}/oneprocess.c (100%) rename trunk/user/vsftpd/{ => src}/oneprocess.h (100%) rename trunk/user/vsftpd/{ => src}/opts.c (100%) rename trunk/user/vsftpd/{ => src}/opts.h (100%) rename trunk/user/vsftpd/{ => src}/parseconf.c (100%) rename trunk/user/vsftpd/{ => src}/parseconf.h (100%) rename trunk/user/vsftpd/{ => src}/port/aix_bogons.h (100%) rename trunk/user/vsftpd/{ => src}/port/cmsg_extras.h (100%) rename trunk/user/vsftpd/{ => src}/port/dirfd_extras.h (100%) rename trunk/user/vsftpd/{ => src}/port/hpux_bogons.h (100%) rename trunk/user/vsftpd/{ => src}/port/irix_bogons.h (100%) rename trunk/user/vsftpd/{ => src}/port/porting_junk.h (100%) rename trunk/user/vsftpd/{ => src}/port/solaris_bogons.h (100%) rename trunk/user/vsftpd/{ => src}/port/tru64_bogons.h (100%) rename trunk/user/vsftpd/{ => src}/postlogin.c (100%) rename trunk/user/vsftpd/{ => src}/postlogin.h (100%) rename trunk/user/vsftpd/{ => src}/postprivparent.c (100%) rename trunk/user/vsftpd/{ => src}/postprivparent.h (100%) rename trunk/user/vsftpd/{ => src}/prelogin.c (100%) rename trunk/user/vsftpd/{ => src}/prelogin.h (100%) rename trunk/user/vsftpd/{ => src}/privops.c (100%) rename trunk/user/vsftpd/{ => src}/privops.h (100%) rename trunk/user/vsftpd/{ => src}/privsock.c (100%) rename trunk/user/vsftpd/{ => src}/privsock.h (100%) rename trunk/user/vsftpd/{ => src}/ptracesandbox.c (100%) rename trunk/user/vsftpd/{ => src}/ptracesandbox.h (100%) rename trunk/user/vsftpd/{ => src}/readwrite.c (100%) rename trunk/user/vsftpd/{ => src}/readwrite.h (100%) rename trunk/user/vsftpd/{ => src}/secbuf.c (100%) rename trunk/user/vsftpd/{ => src}/secbuf.h (100%) rename trunk/user/vsftpd/{ => src}/seccompsandbox.c (100%) rename trunk/user/vsftpd/{ => src}/seccompsandbox.h (100%) rename trunk/user/vsftpd/{ => src}/secutil.c (100%) rename trunk/user/vsftpd/{ => src}/secutil.h (100%) rename trunk/user/vsftpd/{ => src}/session.h (100%) rename trunk/user/vsftpd/{ => src}/ssl.c (100%) rename trunk/user/vsftpd/{ => src}/ssl.h (100%) rename trunk/user/vsftpd/{ => src}/sslslave.c (100%) rename trunk/user/vsftpd/{ => src}/sslslave.h (100%) rename trunk/user/vsftpd/{ => src}/standalone.c (100%) rename trunk/user/vsftpd/{ => src}/standalone.h (100%) rename trunk/user/vsftpd/{ => src}/str.c (100%) rename trunk/user/vsftpd/{ => src}/str.h (100%) rename trunk/user/vsftpd/{ => src}/strlist.c (100%) rename trunk/user/vsftpd/{ => src}/strlist.h (100%) rename trunk/user/vsftpd/{ => src}/sysdeputil.c (100%) rename trunk/user/vsftpd/{ => src}/sysdeputil.h (100%) rename trunk/user/vsftpd/{ => src}/sysstr.c (100%) rename trunk/user/vsftpd/{ => src}/sysstr.h (100%) rename trunk/user/vsftpd/{ => src}/sysutil.c (100%) rename trunk/user/vsftpd/{ => src}/sysutil.h (100%) rename trunk/user/vsftpd/{ => src}/tcpwrap.c (100%) rename trunk/user/vsftpd/{ => src}/tcpwrap.h (100%) rename trunk/user/vsftpd/{ => src}/tunables.c (100%) rename trunk/user/vsftpd/{ => src}/tunables.h (100%) rename trunk/user/vsftpd/{ => src}/twoprocess.c (100%) rename trunk/user/vsftpd/{ => src}/twoprocess.h (100%) rename trunk/user/vsftpd/{ => src}/utility.c (100%) rename trunk/user/vsftpd/{ => src}/utility.h (100%) rename trunk/user/vsftpd/{ => src}/vsf_findlibs.sh (100%) rename trunk/user/vsftpd/{ => src}/vsftpd.8 (100%) rename trunk/user/vsftpd/{ => src}/vsftpd.conf (100%) rename trunk/user/vsftpd/{ => src}/vsftpd.conf.5 (100%) rename trunk/user/vsftpd/{ => src}/vsftpver.h (100%) delete mode 100644 trunk/user/vsftpd/xinetd.d/vsftpd create mode 100644 trunk/user/wsdd2/src/Makefile rename trunk/user/wsdd2/{ => src}/llmnr.c (100%) rename trunk/user/wsdd2/{ => src}/wsd.c (100%) rename trunk/user/wsdd2/{ => src}/wsd.h (100%) rename trunk/user/wsdd2/{ => src}/wsdd.h (100%) rename trunk/user/wsdd2/{ => src}/wsdd2.c (100%) diff --git a/trunk/configure b/trunk/configure index 46e938da9e8..d7b60982d68 100755 --- a/trunk/configure +++ b/trunk/configure @@ -107,8 +107,8 @@ mkdir -p $ROOTDIR/images ln -sf vendors/Ralink/config.arch config.arch cp -fL "$kernel_cf" "$kernel_tf" cp -fL "$busybox_cf" "$busybox_tf" -cp -fL "$board_mk" "$ROOTDIR/user/shared/board.mk" -cp -fL "$board_h" "$ROOTDIR/user/shared/include/ralink_board.h" +cp -fL "$board_mk" "$ROOTDIR/user/board.mk" +cp -fL "$board_h" "$ROOTDIR/user/shared/src/include/ralink_board.h" ############################# SMP ##################################### if [ -n "$CONFIG_SMP" ] ; then func_enable_busybox_param "CONFIG_FEATURE_TOP_SMP_CPU" diff --git a/trunk/user/.gitignore b/trunk/user/.gitignore index de5bca0a2c6..b068cfb1d22 100644 --- a/trunk/user/.gitignore +++ b/trunk/user/.gitignore @@ -1,3 +1,4 @@ +board.mk 802.1x/rt2860apd dns2tcp/dns2tcp/dns2tcp dropbear/dropbearmulti diff --git a/trunk/user/LPRng/Makefile b/trunk/user/LPRng/Makefile index 0c06626d358..c95e6c44f61 100644 --- a/trunk/user/LPRng/Makefile +++ b/trunk/user/LPRng/Makefile @@ -1,278 +1,15 @@ -########################################################################### -# LPRng - An Extended Print Spooler System -# -# Copyright 1988-2001 Patrick Powell, San Diego, CA -# papowell@lprng.com -# See LICENSE for conditions of use. -# -########################################################################### -# MODULE: Makefile.in -# PURPOSE: top level Makefile for LPD Software -# $Id: Makefile,v 1.1.1.1 2008/10/15 03:28:09 james26_jang Exp $ -########################################################################## +include $(ROOTDIR)/rules.mk -#**************###########************** -# You must use ANSI C and GNU Make! -#*************************************** +PKG_NAME:=LPRng +PKG_JOBS:=-j1 -PACKAGE=LPRng -VERSION=3.8.22 -SRC=. +include $(INCLUDE_DIR)/package.mk -INSTALL=/usr/bin/install -c +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -lshared -# prefix -prefix=/usr/local -# exec prefix -exec_prefix=${prefix} -# for binaries -bindir=${exec_prefix}/bin -# for admin type of binaries -sbindir=${exec_prefix}/sbin -# for the filters -libexecdir=${exec_prefix}/libexec -# for the configuration stuff -sysconfdir=${prefix}/etc -# for the man pages -mandir=${prefix}/man -# top build directory -top_builddir=. - -LPD_PERMS_PATH=\"${sysconfdir}/lpd/lpd.perms\" -LPD_CONF_PATH=\"${sysconfdir}/lpd/lpd.conf\" -PRINTCAP_PATH=\"${sysconfdir}/printcap\" -LPD_PATH=\"${sbindir}/lpd\" -#SHELL="/bin/sh" -LOCKFILE=\"/var/run/lpd\" -PSHOWALL="-ax" -FILTER_DIR=${libexecdir}/filters -LOCALEDIR=${prefix}/share/locale -INIT= -USE_NLS=no -LIBTOOL=$(SHELL) $(top_builddir)/libtool - -#============================================================================= -# List the directories you want to generate: -# DIRS for all, clean, etc. -# ALLDIRS for other such as documentation -#============================================================================= - -DIRS= UTILS src po man -INSTALLDIRS= UTILS src po man -FILES=./postinstall ./preremove ./postremove ./lpd.conf -ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/DOCS -ROMFSDIR = $(ROOTDIR)/romfs - -############################################################################### - -all: ${DIRS} ${FILES} - -SCRIPTS=init.freebsd init.linux init.redhat init.linuxsb init.solaris ltmain postinstall.freebsd postinstall.generic postinstall.linux postinstall.solaris postremove.generic postremove.solaris preinstall.solaris preremove.freebsd preremove.generic preremove.linux preremove.solaris - -$(SCRIPTS): header - cat header ${SRC}/$@.sh >$@ - chmod 755 $@; - -header: Makefile - @echo "#!/bin/sh" >$@ - @echo PREFIX=$(prefix) >>$@ - @echo LPD_PATH=$(LPD_PATH) >>$@ - @echo INSTALL=\"$(INSTALL)\" >>$@ - @echo LPD_PERMS_PATH=$(LPD_PERMS_PATH) >>$@ - @echo LPD_CONF_PATH=$(LPD_CONF_PATH) >>$@ - @echo PRINTCAP_PATH=$(PRINTCAP_PATH) >>$@ - @echo SYSCONFDIR=$(sysconfdir) >>$@ - @echo SBINDIR=$(sbindir) >>$@ - @echo FILTER_DIR=$(FILTER_DIR) >>$@ - @echo LOCKFILE=$(LOCKFILE) >>$@ - @echo PSHOWALL=\"$(PSHOWALL)\" >>$@ - @echo "VERSION=$(VERSION)" >>$@ - @echo "INIT=$(INIT)" >>$@ - @echo "MANDIR=$(mandir)" >>$@ - -./postinstall: $(SCRIPTS) Makefile - OSNAME=elf; case "elf" in \ - *linux* ) OSNAME=linux;; \ - *freebsd* ) OSNAME=freebsd;; \ - *solaris* ) OSNAME=solaris;; \ - esac; \ - if test -f postinstall.$${OSNAME} ; then s=postinstall.$${OSNAME} ; else s=postinstall.generic; fi; \ - echo POSTINSTALL "'$$s'"; cp $$s postinstall; - -./preremove: $(SCRIPTS) Makefile - OSNAME=elf; case "elf" in *linux* ) OSNAME=linux;; esac; \ - if test -f preremove.$${OSNAME} ; then s=preremove.$${OSNAME} ; else s=preremove.generic; fi; \ - echo PREREMOVE "'$$s'"; cp $$s preremove; - -./postremove: $(SCRIPTS) Makefile - OSNAME=elf; case "elf" in *linux* ) OSNAME=linux;; esac; \ - if test -f postremove.$${OSNAME} ; then s=postremove.$${OSNAME} ; else s=postremove.generic; fi; \ - echo POSTREMOVE "'$$s'"; cp $$s postremove; - -# define default target -.PHONY: all warn TAGS clean uninstall install info dvi check \ - tar send realclean mostlyclean distclean dist update ci cifiles $(ALLDIRS) \ - -MAKETARGET=all - -############################################################################### -$(ALLDIRS): - if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \ - cd $@; $(MAKE) localedir=${LOCALEDIR} \ - DESTDIR=$(DESTDIR) $(MAKETARGET) ; \ - fi - -TAGS clean:: - -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS) - -clean:: - -rm -f header lpd.conf $(FILES) $(SCRIPTS) postinstall preremove postremove a.out - -rm -f *.bak ? ?.* core *.old *~ po/*~ - -#install: all -# $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS) -# -# if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \ -# MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \ -# fi; -# @echo ""; - -install: all - install -D src/lpd $(INSTALLDIR)/usr/sbin/lpd - $(STRIP) $(INSTALLDIR)/usr/sbin/lpd +$(eval $(call BuildPackage,LPRng)) romfs: - install -D src/lpd $(ROMFSDIR)/usr/sbin/lpd - $(STRIP) $(ROMFSDIR)/usr/sbin/lpd - -info dvi check: - -./lpd.conf: src/lpd.conf - cp src/lpd.conf $@ - chmod 644 $@ - -src/lpd.conf: - cd src; $(MAKE) MAKETARGET=lpd.conf - -realclean mostlyclean distclean: clean - rm -rf DISTRIBUTIONS/FreeBSD*/work DISTRIBUTIONS/FreeBSD*/*.tgz ; - $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(ALLDIRS) - rm -f `find . -type f -name '*.old' -print` \ - `find . -type f -name '*.bak' -print` \ - `find . -type f -name '*.orig' -print` \ - configure.lineno config.cache config.log config.status lpd.conf libtool \ - Makefile */Makefile po/POTFILES - rm -f `find . -type f -name '*.in' -print | sed -e 's/\.in$$//' -e /configure/d ` - -############################################################################### -uninstall: - echo "you must uninstall by hand" - -ci: cifiles - for i in $(ALLDIRS); do \ - case $$i in \ - po ) ;; \ - * ) $(MAKE) MAKETARGET=$@ $$i ;; \ - esac; \ - done; - chmod 755 `find . -name install-sh -print` - chmod 755 `find . -name mkinstalldirs -print` - -#CI= -#CO=-kv -CO=-l - -cifiles: - for i in . $(ALLDIRS); do \ - if test ! -d $$i/RCS ; then \ - mkdir $$i/RCS; \ - fi; \ - done; - checkin() { \ - (set +e; rcs -l $$1; exit 0); \ - ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ - }; \ - for i in * */Makefile po/* ; do \ - if test -f "$$i" ; then \ - case "$$i" in \ - *.mo ) ;; \ - config.* ) ;; \ - configure ) ;; \ - * ) checkin $$i ;; \ - esac; \ - fi; \ - done; - -############################################################################### -# Update the patch level when you make a new version -# do this before you start changes -# Don't even think about making this configurable, it is for -# distribution and update purposes only! -# Patrick Powell -############################################################################### - -update: - rm -f src/include/license.h src/include/copyright.h - sed -e 's/"/\\"/g' -e 's/.*/"&",/' LICENSE >src/include/license.h - sed -e 's/"/\\"/g' -e 's/.*/"&",/' COPYRIGHT >src/include/copyright.h - for i in VERSION ./src/include/patchlevel.h configure.in ; do \ - rcs -l $$i; chmod +w $$i; \ - done; - if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ - if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ - DIR=`echo $${DIR} | sed 's,.*/,,'`; \ - DIRVER=` echo $${DIR} | sed 's,.*-,,'`; \ - echo DIR $${DIR}, DIRVER $${DIRVER}; \ - echo "#define PATCHLEVEL \"$${DIR}\"" >./src/include/patchlevel.h; \ - echo $${DIR} >VERSION; \ - S=`echo *.sh | sed -e 's/\.sh//g'`; \ - perl -spi -e "s,=.*,=$${DIRVER}, if(/^VERSION=/ or /^#.* VERSION=/); \ - s,^DISTNAME=.*,DISTNAME=$${DIR},; \ - s,^PORTNAME=.*,PORTNAME=$(PACKAGE),; \ - s,^PORTVERSION=.*,PORTVERSION=$${DIRVER},; \ - s,package name \".*\",package name \"$${DIR}\",; \ - s,^SCRIPTS=.*,SCRIPTS=$$S,;" \ - configure.in lpd.perms.in \ - DISTRIBUTIONS/*/Makefile \ - po/Makefile.in.in printcap - perl -spi -e 's,.*,"Project-Id-Version: $(PACKAGE) $(VERSION)\\n", if(/^"Project-Id/);' \ - po/*.po - sh CREATE_CONFIGURE - sh STANDARD_configuration -# ci $(CI) -l -f -mUpdate -t-Initial Makefile DOCS/Makefile src/Makefile - for i in DOCS man ; do \ - (cd $$i ; $(MAKE) $@ ); \ - done; - for i in po ; do \ - (cd $$i ; $(MAKE) update-po ); \ - done - -############################################################################### -# Make a gnutar distribution -# - note that not all the source tree is sent out -# -############################################################################### - -tar: distclean - rm -f */Makefile Makefile - chmod 755 `find . -name install-sh -print` - chmod 755 `find . -name mkinstalldirs -print` - chmod -R +w . - if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ - if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ - echo $${DIR}; \ - DIR=`echo $${DIR} | sed 's,.*/,,'`; \ - cd ..; \ - tar '--exclude=RCS' -zcf $${DIR}.tgz $${DIR}; \ - md5 $${DIR}.tgz | pgp -fast -u papowell@lprng > $${DIR}.tgz.md5 - @echo "" - -configure: configure.in - autoconf - autoheader - -dist: update ci distclean tar send -redist: ci distclean tar send - -send: - if [ -f ../SENDTO ] ; then (cd ..; sh SENDTO) ; fi + $(INSTALL_DIR) $(ROMFSDIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/lpd $(ROMFSDIR)/usr/sbin/lpd diff --git a/trunk/user/LPRng/Makefile.in b/trunk/user/LPRng/Makefile.in deleted file mode 100644 index 096dd104ba6..00000000000 --- a/trunk/user/LPRng/Makefile.in +++ /dev/null @@ -1,269 +0,0 @@ -########################################################################### -# LPRng - An Extended Print Spooler System -# -# Copyright 1988-2001 Patrick Powell, San Diego, CA -# papowell@lprng.com -# See LICENSE for conditions of use. -# -########################################################################### -# MODULE: Makefile.in -# PURPOSE: top level Makefile for LPD Software -# $Id: Makefile.in,v 1.1.1.1 2008/10/15 03:28:09 james26_jang Exp $ -########################################################################## - -#**************###########************** -# You must use ANSI C and GNU Make! -#*************************************** - -PACKAGE=@PACKAGE@ -VERSION=@VERSION@ -SRC=@srcdir@ -@SET_MAKE@ -INSTALL=@INSTALL@ - -# prefix -prefix=@prefix@ -# exec prefix -exec_prefix=@exec_prefix@ -# for binaries -bindir=@bindir@ -# for admin type of binaries -sbindir=@sbindir@ -# for the filters -libexecdir=@libexecdir@ -# for the configuration stuff -sysconfdir=@sysconfdir@ -# for the man pages -mandir=@mandir@ -# top build directory -top_builddir=. - -LPD_PERMS_PATH=\"@LPD_PERMS_PATH@\" -LPD_CONF_PATH=\"@LPD_CONF_PATH@\" -PRINTCAP_PATH=\"@PRINTCAP_PATH@\" -LPD_PATH=\"@LPD_DIR@/lpd\" -SHELL="@SHELL@" -LOCKFILE=\"@LOCKFILE@\" -PSHOWALL="@PSHOWALL@" -FILTER_DIR=@FILTER_DIR@ -LOCALEDIR=@LOCALEDIR@ -INIT=@INIT@ -USE_NLS=@USE_NLS@ -LIBTOOL=@LIBTOOL@ - -#============================================================================= -# List the directories you want to generate: -# DIRS for all, clean, etc. -# ALLDIRS for other such as documentation -#============================================================================= - -DIRS= UTILS src po man -INSTALLDIRS= UTILS src po man -FILES=./postinstall ./preremove ./postremove ./lpd.conf -ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/DOCS - -############################################################################### - -all: ${DIRS} ${FILES} - -SCRIPTS=init.freebsd init.linux init.redhat init.linuxsb init.solaris ltmain postinstall.freebsd postinstall.generic postinstall.linux postinstall.solaris postremove.generic postremove.solaris preinstall.solaris preremove.freebsd preremove.generic preremove.linux preremove.solaris - -$(SCRIPTS): header - cat header ${SRC}/$@.sh >$@ - chmod 755 $@; - -header: Makefile - @echo "#!@SHELL@" >$@ - @echo PREFIX=$(prefix) >>$@ - @echo LPD_PATH=$(LPD_PATH) >>$@ - @echo INSTALL=\"$(INSTALL)\" >>$@ - @echo LPD_PERMS_PATH=$(LPD_PERMS_PATH) >>$@ - @echo LPD_CONF_PATH=$(LPD_CONF_PATH) >>$@ - @echo PRINTCAP_PATH=$(PRINTCAP_PATH) >>$@ - @echo SYSCONFDIR=$(sysconfdir) >>$@ - @echo SBINDIR=$(sbindir) >>$@ - @echo FILTER_DIR=$(FILTER_DIR) >>$@ - @echo LOCKFILE=$(LOCKFILE) >>$@ - @echo PSHOWALL=\"$(PSHOWALL)\" >>$@ - @echo "VERSION=$(VERSION)" >>$@ - @echo "INIT=$(INIT)" >>$@ - @echo "MANDIR=$(mandir)" >>$@ - -./postinstall: $(SCRIPTS) Makefile - OSNAME=@OSNAME@; case "@OSNAME@" in \ - *linux* ) OSNAME=linux;; \ - *freebsd* ) OSNAME=freebsd;; \ - *solaris* ) OSNAME=solaris;; \ - esac; \ - if test -f postinstall.$${OSNAME} ; then s=postinstall.$${OSNAME} ; else s=postinstall.generic; fi; \ - echo POSTINSTALL "'$$s'"; cp $$s postinstall; - -./preremove: $(SCRIPTS) Makefile - OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; \ - if test -f preremove.$${OSNAME} ; then s=preremove.$${OSNAME} ; else s=preremove.generic; fi; \ - echo PREREMOVE "'$$s'"; cp $$s preremove; - -./postremove: $(SCRIPTS) Makefile - OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; \ - if test -f postremove.$${OSNAME} ; then s=postremove.$${OSNAME} ; else s=postremove.generic; fi; \ - echo POSTREMOVE "'$$s'"; cp $$s postremove; - -# define default target -.PHONY: all warn TAGS clean uninstall install info dvi check \ - tar send realclean mostlyclean distclean dist update ci cifiles $(ALLDIRS) \ - -MAKETARGET=all - -############################################################################### -$(ALLDIRS): - if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \ - cd $@; $(MAKE) localedir=${LOCALEDIR} \ - DESTDIR=$(DESTDIR) $(MAKETARGET) ; \ - fi - -TAGS clean:: - -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS) - -clean:: - -rm -f header lpd.conf $(FILES) $(SCRIPTS) postinstall preremove postremove a.out - -rm -f *.bak ? ?.* core *.old *~ po/*~ - -install: all - $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS) - - if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \ - MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \ - fi; - @echo ""; - -info dvi check: - -./lpd.conf: src/lpd.conf - cp src/lpd.conf $@ - chmod 644 $@ - -src/lpd.conf: - cd src; $(MAKE) MAKETARGET=lpd.conf - -realclean mostlyclean distclean: clean - rm -rf DISTRIBUTIONS/FreeBSD*/work DISTRIBUTIONS/FreeBSD*/*.tgz ; - $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(ALLDIRS) - rm -f `find . -type f -name '*.old' -print` \ - `find . -type f -name '*.bak' -print` \ - `find . -type f -name '*.orig' -print` \ - configure.lineno config.cache config.log config.status lpd.conf libtool \ - Makefile */Makefile po/POTFILES - rm -f `find . -type f -name '*.in' -print | sed -e 's/\.in$$//' -e /configure/d ` - -############################################################################### -uninstall: - echo "you must uninstall by hand" - -ci: cifiles - for i in $(ALLDIRS); do \ - case $$i in \ - po ) ;; \ - * ) $(MAKE) MAKETARGET=$@ $$i ;; \ - esac; \ - done; - chmod 755 `find . -name install-sh -print` - chmod 755 `find . -name mkinstalldirs -print` - -#CI= -#CO=-kv -CO=-l - -cifiles: - for i in . $(ALLDIRS); do \ - if test ! -d $$i/RCS ; then \ - mkdir $$i/RCS; \ - fi; \ - done; - checkin() { \ - (set +e; rcs -l $$1; exit 0); \ - ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ - }; \ - for i in * */Makefile po/* ; do \ - if test -f "$$i" ; then \ - case "$$i" in \ - *.mo ) ;; \ - config.* ) ;; \ - configure ) ;; \ - * ) checkin $$i ;; \ - esac; \ - fi; \ - done; - -############################################################################### -# Update the patch level when you make a new version -# do this before you start changes -# Don't even think about making this configurable, it is for -# distribution and update purposes only! -# Patrick Powell -############################################################################### - -update: - rm -f src/include/license.h src/include/copyright.h - sed -e 's/"/\\"/g' -e 's/.*/"&",/' LICENSE >src/include/license.h - sed -e 's/"/\\"/g' -e 's/.*/"&",/' COPYRIGHT >src/include/copyright.h - for i in VERSION ./src/include/patchlevel.h configure.in ; do \ - rcs -l $$i; chmod +w $$i; \ - done; - if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ - if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ - DIR=`echo $${DIR} | sed 's,.*/,,'`; \ - DIRVER=` echo $${DIR} | sed 's,.*-,,'`; \ - echo DIR $${DIR}, DIRVER $${DIRVER}; \ - echo "#define PATCHLEVEL \"$${DIR}\"" >./src/include/patchlevel.h; \ - echo $${DIR} >VERSION; \ - S=`echo *.sh | sed -e 's/\.sh//g'`; \ - perl -spi -e "s,=.*,=$${DIRVER}, if(/^VERSION=/ or /^#.* VERSION=/); \ - s,^DISTNAME=.*,DISTNAME=$${DIR},; \ - s,^PORTNAME=.*,PORTNAME=$(PACKAGE),; \ - s,^PORTVERSION=.*,PORTVERSION=$${DIRVER},; \ - s,package name \".*\",package name \"$${DIR}\",; \ - s,^SCRIPTS=.*,SCRIPTS=$$S,;" \ - configure.in lpd.perms.in \ - DISTRIBUTIONS/*/Makefile \ - po/Makefile.in.in printcap - perl -spi -e 's,.*,"Project-Id-Version: $(PACKAGE) $(VERSION)\\n", if(/^"Project-Id/);' \ - po/*.po - sh CREATE_CONFIGURE - sh STANDARD_configuration -# ci $(CI) -l -f -mUpdate -t-Initial Makefile DOCS/Makefile src/Makefile - for i in DOCS man ; do \ - (cd $$i ; $(MAKE) $@ ); \ - done; - for i in po ; do \ - (cd $$i ; $(MAKE) update-po ); \ - done - -############################################################################### -# Make a gnutar distribution -# - note that not all the source tree is sent out -# -############################################################################### - -tar: distclean - rm -f */Makefile Makefile - chmod 755 `find . -name install-sh -print` - chmod 755 `find . -name mkinstalldirs -print` - chmod -R +w . - if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ - if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ - echo $${DIR}; \ - DIR=`echo $${DIR} | sed 's,.*/,,'`; \ - cd ..; \ - tar '--exclude=RCS' -zcf $${DIR}.tgz $${DIR}; \ - md5 $${DIR}.tgz | pgp -fast -u papowell@lprng > $${DIR}.tgz.md5 - @echo "" - -configure: configure.in - autoconf - autoheader - -dist: update ci distclean tar send -redist: ci distclean tar send - -send: - if [ -f ../SENDTO ] ; then (cd ..; sh SENDTO) ; fi diff --git a/trunk/user/LPRng/mkinstalldirs b/trunk/user/LPRng/mkinstalldirs deleted file mode 100644 index 23a638c9f63..00000000000 --- a/trunk/user/LPRng/mkinstalldirs +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -# $Id: mkinstalldirs,v 1.1.1.1 2008/10/15 03:28:09 james26_jang Exp $ - -errstatus=0 - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# mkinstalldirs ends here diff --git a/trunk/user/LPRng/ABOUT-NLS b/trunk/user/LPRng/src/ABOUT-NLS similarity index 100% rename from trunk/user/LPRng/ABOUT-NLS rename to trunk/user/LPRng/src/ABOUT-NLS diff --git a/trunk/user/LPRng/ABOUT-NLS.LPRng b/trunk/user/LPRng/src/ABOUT-NLS.LPRng similarity index 100% rename from trunk/user/LPRng/ABOUT-NLS.LPRng rename to trunk/user/LPRng/src/ABOUT-NLS.LPRng diff --git a/trunk/user/LPRng/CHANGES b/trunk/user/LPRng/src/CHANGES similarity index 100% rename from trunk/user/LPRng/CHANGES rename to trunk/user/LPRng/src/CHANGES diff --git a/trunk/user/LPRng/CONFIG_JW b/trunk/user/LPRng/src/CONFIG_JW similarity index 100% rename from trunk/user/LPRng/CONFIG_JW rename to trunk/user/LPRng/src/CONFIG_JW diff --git a/trunk/user/LPRng/CONTRIBUTORS b/trunk/user/LPRng/src/CONTRIBUTORS similarity index 100% rename from trunk/user/LPRng/CONTRIBUTORS rename to trunk/user/LPRng/src/CONTRIBUTORS diff --git a/trunk/user/LPRng/COPYRIGHT b/trunk/user/LPRng/src/COPYRIGHT similarity index 100% rename from trunk/user/LPRng/COPYRIGHT rename to trunk/user/LPRng/src/COPYRIGHT diff --git a/trunk/user/LPRng/CREATE_CONFIGURE b/trunk/user/LPRng/src/CREATE_CONFIGURE similarity index 100% rename from trunk/user/LPRng/CREATE_CONFIGURE rename to trunk/user/LPRng/src/CREATE_CONFIGURE diff --git a/trunk/user/LPRng/ChangeLog b/trunk/user/LPRng/src/ChangeLog similarity index 100% rename from trunk/user/LPRng/ChangeLog rename to trunk/user/LPRng/src/ChangeLog diff --git a/trunk/user/LPRng/DISTRIBUTIONS/BSDI/Makefile b/trunk/user/LPRng/src/DISTRIBUTIONS/BSDI/Makefile similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/BSDI/Makefile rename to trunk/user/LPRng/src/DISTRIBUTIONS/BSDI/Makefile diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/LPRng-3.8.22.tbz b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/LPRng-3.8.22.tbz similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/LPRng-3.8.22.tbz rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/LPRng-3.8.22.tbz diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile.build b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile.build similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile.build rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/Makefile.build diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/distinfo b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/distinfo similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/distinfo rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/distinfo diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/files-pkg-message b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/files-pkg-message similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/files-pkg-message rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/files-pkg-message diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-deinstall b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-deinstall similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-deinstall rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-deinstall diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-descr b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-descr similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-descr rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-descr diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-install b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-install similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-install rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-install diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-message b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-message similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-message rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-message diff --git a/trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-plist b/trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-plist similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-plist rename to trunk/user/LPRng/src/DISTRIBUTIONS/FreeBSD-4.ports.sysutils.LPRng/pkg-plist diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Makefile b/trunk/user/LPRng/src/DISTRIBUTIONS/Makefile similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Makefile rename to trunk/user/LPRng/src/DISTRIBUTIONS/Makefile diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Makefile,v b/trunk/user/LPRng/src/DISTRIBUTIONS/Makefile,v similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Makefile,v rename to trunk/user/LPRng/src/DISTRIBUTIONS/Makefile,v diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Makefile.in b/trunk/user/LPRng/src/DISTRIBUTIONS/Makefile.in similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Makefile.in rename to trunk/user/LPRng/src/DISTRIBUTIONS/Makefile.in diff --git a/trunk/user/LPRng/DISTRIBUTIONS/README b/trunk/user/LPRng/src/DISTRIBUTIONS/README similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/README rename to trunk/user/LPRng/src/DISTRIBUTIONS/README diff --git a/trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/LPRng.spec b/trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/LPRng.spec similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/LPRng.spec rename to trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/LPRng.spec diff --git a/trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/Makefile b/trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/Makefile similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/Makefile rename to trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/Makefile diff --git a/trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/UNPACK b/trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/UNPACK similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/UNPACK rename to trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/UNPACK diff --git a/trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/lpd.init b/trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/lpd.init similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/RPM.RedHat/lpd.init rename to trunk/user/LPRng/src/DISTRIBUTIONS/RPM.RedHat/lpd.init diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/Makefile b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/Makefile similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/Makefile rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/Makefile diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/README b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/README similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/README rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/README diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/UNPACK b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/UNPACK similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/UNPACK rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/UNPACK diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/copyright b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/copyright similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/copyright rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/copyright diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/i.preserve b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/i.preserve similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/i.preserve rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/i.preserve diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/inetd.conf b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/inetd.conf similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/inetd.conf rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/inetd.conf diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/prototype.pre b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/prototype.pre similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/prototype.pre rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/prototype.pre diff --git a/trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/r.preserve b/trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/r.preserve similarity index 100% rename from trunk/user/LPRng/DISTRIBUTIONS/Solaris.pkg/r.preserve rename to trunk/user/LPRng/src/DISTRIBUTIONS/Solaris.pkg/r.preserve diff --git a/trunk/user/LPRng/INSTALL b/trunk/user/LPRng/src/INSTALL similarity index 100% rename from trunk/user/LPRng/INSTALL rename to trunk/user/LPRng/src/INSTALL diff --git a/trunk/user/LPRng/KERBEROS_configuration b/trunk/user/LPRng/src/KERBEROS_configuration similarity index 100% rename from trunk/user/LPRng/KERBEROS_configuration rename to trunk/user/LPRng/src/KERBEROS_configuration diff --git a/trunk/user/LPRng/LICENSE b/trunk/user/LPRng/src/LICENSE similarity index 100% rename from trunk/user/LPRng/LICENSE rename to trunk/user/LPRng/src/LICENSE diff --git a/trunk/user/LPRng/LINK b/trunk/user/LPRng/src/LINK similarity index 100% rename from trunk/user/LPRng/LINK rename to trunk/user/LPRng/src/LINK diff --git a/trunk/user/LPRng/MIRRORS b/trunk/user/LPRng/src/MIRRORS similarity index 100% rename from trunk/user/LPRng/MIRRORS rename to trunk/user/LPRng/src/MIRRORS diff --git a/trunk/user/LPRng/MIT_configure b/trunk/user/LPRng/src/MIT_configure similarity index 100% rename from trunk/user/LPRng/MIT_configure rename to trunk/user/LPRng/src/MIT_configure diff --git a/trunk/user/LPRng/src/Makefile b/trunk/user/LPRng/src/Makefile index 92b71747c21..30872774670 100644 --- a/trunk/user/LPRng/src/Makefile +++ b/trunk/user/LPRng/src/Makefile @@ -1,75 +1,26 @@ -########################################################################## +########################################################################### # LPRng - An Extended Print Spooler System # -# Copyright 1988-2001 Patrick Powell, San Diego, California +# Copyright 1988-2001 Patrick Powell, San Diego, CA # papowell@lprng.com # See LICENSE for conditions of use. # ########################################################################### -# MODULE: Makefile -# Makefile.in,v 1.1 2001/08/21 20:33:17 root Exp -########################################################################### -# - -#************** GENERAL CONFIGURATION INFORMATION ************************ -# where user commands are installed: lpr, lpq, lprm, lpc. -# Also the SysV emulation commands: lp, lpstat. -# If these paths are /usr/lib, /usr/ucb etc., make sure you -# have backup copies of the system version! -# -# -# These are automatically sedded in by the "configure" script, but you -# may need to change them if you're on a strange version of UNIX. +# MODULE: Makefile.in +# PURPOSE: top level Makefile for LPD Software +# $Id: Makefile,v 1.1.1.1 2008/10/15 03:28:09 james26_jang Exp $ +########################################################################## +#**************###########************** +# You must use ANSI C and GNU Make! +#*************************************** PACKAGE=LPRng VERSION=3.8.22 - -# where the source directory is SRC=. -top_srcdir=.. -top_builddir=.. -#SRCBASE=../../.. -TOP=../.. -# which make we are using - - -# what C compiler to use. -#CC:=mipsel-uclibc-gcc -#CC:=gcc -#CC:=mipsel-linux-gcc - -# what command to use to "ranlib" or "lorder" the library. -#RANLIB=mipsel-uclibc-ranlib -#AR=mipsel-uclibc-ar -#RANLIB=mipsel-linux-ranlib -#AR=mipsel-linux-ar - -# what C preprocessor to use. -#CPP:=mipsel-uclibc-gcc -E -#CPP:=gcc -E -#CPP:=mipsel-linux-gcc -E -CPP:= $(CC) -E - -# how to install stuff. -INSTALLCMD=/usr/bin/install -c -# a shell interpreter that's as close to the POSIX shell as possible. -SHELL_PATH=/bin/sh -SHELL = /bin/sh - -# loader for c programs -#LDCC=mipsel-uclibc-gcc -#LDCC=gcc -#LDCC=mipsel-linux-gcc -LDCC=$(CC) - -# any libs that need to be used to get these programs to compile: -LIBS= - -# what libtool -LIBTOOL=$(SHELL) $(top_builddir)/libtool -### PATHS #### +INSTALL=/usr/bin/install -c + # prefix prefix=/usr/local # exec prefix @@ -82,488 +33,242 @@ sbindir=${exec_prefix}/sbin libexecdir=${exec_prefix}/libexec # for the configuration stuff sysconfdir=${prefix}/etc -# libraries -libdir=${exec_prefix}/lib - -# install options - -STRIP= -s - -CFLAGS+= \ - -I${top_builddir} -I. \ - -I${SRC}/include -I${SRC}/common -I$(TOP)/shared \ - -g -W -Wall -fcommon -Wno-unused -g -Os -g -W -Wall -Wno-unused -DHAVE_CONFIG_H -DWINDOW_1 -DTEST_WRITE -DNODEBUG -DLPR_with_ASUS ${GLOBAL_OPTIONS} -DUSBONLY #-DRETURNOK - -USER_OBJS := -LDFLAGS := -L$(TOP)/shared -lshared - -FILTER_DIR = ${libexecdir}/filters -LPD_DIR = ${sbindir} - - -#********************** End of configure modifiable settings ************ - - -#********************** OPTIONAL DEFINITIONS **************************** -# These are various flags and settings that will be used by the -# compiler to generate code -# - -#### ****** TESTING AND SECURITY LOOPHOLE ****************************** -# Define G ETENV to allow the LPD_CONFIG environment -# variable to be used as the name of a configuration file. In non-testing -# systems, this is a security loophole. -#CFLAGS:= $(CFLAGS) -DGETENV=\"1\" - -# Set location of configuration, permissions, and printcap file -# -#GNU - -# CFLAGS:= $(CFLAGS) -DFORMAT_TEST -Wformat - - -##### DMalloc Debugging Package -# -#CFLAGS:= $(CFLAGS) -DDMALLOC -#LIBS:= $(LIBS) -ldmalloc - - - -#********************* OVERRIDING CONFIGURES' GUESSES ****************** -# -# -# If you get errors similar to the ones below, it may be -# because "configure" guessed wrong. You can override the -# guesses here, by uncommenting the appropriate line... - -# "recvfiles.c: unknown struct fsb has no size": -# define STATFS: to use statfs(2) (BSD) -# STATVFS: to use statvfs(2) (SVR4) -# others for system specific cases -# -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=ULTRIX_STATFS -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=SVR3_STATFS -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATVFS -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATFS - -# define MAKE_USE_STTY = -# SGTTYB to use struct sgttyb and (BSD) -# TERMIO to use struct termio and (old sysV) -# TERMIOS to use struct termios and (SVR4) -# -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=SGTTYB -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIO -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIOS - -# a better way to do this is to edit the "ARGH" section of portable.h, -# and add the appropriate lines to the section for your OS, or add a new -# section if one doesn't exist; then you can send me the patches and -# I'll incorporate them into the distribution. - -# -# You might discover that the default locking mechanism -# does not work. Try one of the following to override the -# configured value: fcntl(), lockf(), flock(), and 0 to suppress locking -# -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_fcntl -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_lockf -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_flock -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=0 -# - -# SETPROCTITLE - overwrites the program argument information -# when ps is used, displays status. Used only by LPD -# if this does not work, define the following -# CFLAGS:= $(CFLAGS) -DNO_SETPROCTITLE - - -SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE -INCLUDE=.. ${SRC}/include - -VPATH=..:.:${SRC}/include:${SRC}/common:${SRC} - -######################################################################## - -.SUFFIXES: .lo .sh -LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@ -.c.lo: - $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< - -#********************** End of Configurable Part **************************** - -TARGET= \ - lprng_certs lprng_index_certs \ - lpd\ - ./lpd.conf -#TARGET= \ - lprng_certs lprng_index_certs \ - lpc lpd lpq lpr lprm lpf checkpc lp lpstat \ - lpbanner monitor ./lpd.conf - -NONTARGET = sserver sclient - -LPD_OBJS= lpd.o -LPR_OBJS= lpr.o -LPQ_OBJS= lpq.o -LPSTAT_OBJS= lpstat.o -LPRM_OBJS= lprm.o -LPC_OBJS= lpc.o -CHECKPC_OBJS = checkpc.o -LPF_OBJS = lpf.o plp_snprintf.o -MONITOR_OBJS= monitor.o getopt.o -LPBANNER_OBJS= lpbanner.o plp_snprintf.o - -LIBLPR_OBJS = \ - child.lo controlword.lo \ - debug.lo errormsg.lo fileopen.lo gethostinfo.lo \ - getopt.lo getprinter.lo getqueue.lo globmatch.lo \ - initialize.lo \ - linelist.lo linksupport.lo lockfile.lo \ - lpd_control.lo lpd_dispatch.lo lpd_jobs.lo lpd_rcvjob.lo \ - lpd_remove.lo lpd_status.lo \ - permission.lo plp_snprintf.lo printjob.lo\ - proctitle.lo \ - utilities.lo vars.lo $(USER_OBJS) -#LIBLPR_OBJS = \ - accounting.lo child.lo controlword.lo copyright.lo \ - debug.lo errormsg.lo fileopen.lo gethostinfo.lo \ - getopt.lo getprinter.lo getqueue.lo globmatch.lo \ - initialize.lo krb5_auth.lo \ - linelist.lo linksupport.lo lockfile.lo \ - lpd_control.lo lpd_dispatch.lo lpd_jobs.lo lpd_logger.lo lpd_rcvjob.lo \ - lpd_remove.lo sendauth.lo lpd_secure.lo lpd_status.lo \ - merge.lo permission.lo plp_snprintf.lo printjob.lo \ - proctitle.lo sendjob.lo sendmail.lo sendreq.lo ssl_auth.lo \ - stty.lo user_auth.lo utilities.lo vars.lo md5.lo $(USER_OBJS) - -ALL_OBJS = $(LIBLPR_OBJS) \ - $(LPD_OBJS) \ - -#ALL_OBJS = $(LIBLPR_OBJS) \ - $(LPR_OBJS) $(LPQ_OBJS) $(LPC_OBJS) $(LPRM_OBJS) $(LPD_OBJS) \ - $(CHECKPC_OBJS) $(LPF_OBJS) $(LPRACCNT_OBJS) $(MONITOR_OBJS) $(LPBANNER_OBJS) - -all: $(TARGET) - -relink: - rm -f ${TARGET} - -defs.h: Makefile - cp /dev/null $@ - echo "#define " CHOWN \"/bin/chown\" >>$@ - echo "#define " CHGRP \"/bin/chgrp\" >>$@ - echo "#define " PRINTCAP_PATH \"${sysconfdir}/printcap\" >>$@ - echo "#define " LPD_PRINTCAP_PATH \"${sysconfdir}/lpd/lpd_printcap\" >>$@ - echo "#define " LPD_PERMS_PATH \"${sysconfdir}/lpd/lpd.perms\" >>$@ - echo "#define " LPD_CONF_PATH \"${sysconfdir}/lpd/lpd.conf\" >>$@ - echo "#define " REQUIRE_CONFIGFILES \"1\" >>$@ - echo "#define " FILTER_PATH \"/bin:/usr/bin:/usr/local/bin\" >>$@ - echo "#define " LD_LIBRARY_PATH \"/lib:/usr/lib:/usr/local/lib\" >>$@ - echo "#define " LOCKFILE \"/var/run/lpd\" >>$@ - echo "#define " CLEAR \"/usr/bin/clear\" >>$@ - echo "#define " USERID \"root\" >>$@ - echo "#define " GROUPID \"root\" >>$@ - echo "#define " LOCALEDIR \"${prefix}/share/locale\" >>$@ - echo "#define " DONE_JOBS \"1\" >>$@ - echo "#define " DONE_JOBS_MAX_AGE \"0\" >>$@ - echo "#define " UNIXSOCKETPATH \"/var/run/lprng\" >>$@ - echo "#define " PRUTIL \"/usr/bin/pr\" >>$@ - echo "#define " OPENSSL \"/usr/bin/openssl\" >>$@ - echo "#define " SSL_CA_FILE \"${sysconfdir}/lpd/ssl.ca/ca.crt\" >>$@ - echo "#define " SSL_CA_KEY \"${sysconfdir}/lpd/ssl.ca/ca.key\" >>$@ - echo "#define " SSL_CRL_FILE \"${sysconfdir}/lpd/ssl.crl/ssl.crl\" >>$@ - echo "#define " SSL_CERTS_DIR \"${sysconfdir}/lpd/ssl.certs\" >>$@ - echo "#define " SSL_SERVER_CERT \"${sysconfdir}/lpd/ssl.server/server.crt\" >>$@ - echo "#define " SSL_SERVER_PASSWORD_FILE \"${sysconfdir}/lpd/ssl.server/server.pwd\" >>$@ - -.PHONY: all ci clean \ - uninstall realclean mostlyclean distclean \ - TAGS info generate - -# we want to force defaults to be updated whenever we -# change the options in Makefile or Makefile.bsd -#GNU -vars.o vars.lo: Makefile -# -#BSD vars.o: Makefile.bsd - -# -# use RANLIB with no ordering, or lorder/tsort if it is there -# if you do not have either, fall back and just build archive -# This appears to cover all cases for portability -# - +# for the man pages +mandir=${prefix}/man +# top build directory +top_builddir=. + +LPD_PERMS_PATH=\"${sysconfdir}/lpd/lpd.perms\" +LPD_CONF_PATH=\"${sysconfdir}/lpd/lpd.conf\" +PRINTCAP_PATH=\"${sysconfdir}/printcap\" +LPD_PATH=\"${sbindir}/lpd\" +#SHELL="/bin/sh" +LOCKFILE=\"/var/run/lpd\" +PSHOWALL="-ax" +FILTER_DIR=${libexecdir}/filters +LOCALEDIR=${prefix}/share/locale +INIT= +USE_NLS=no +LIBTOOL=$(SHELL) $(top_builddir)/libtool -liblpr.la: $(LIBLPR_OBJS) - $(LINK) $(LIBLPR_OBJS) -rpath ${libdir} - -lpd: $(LPD_OBJS) liblpr.la - $(LINK) ${LPD_OBJS} liblpr.la $(LIBS) -#lpr: $(LPR_OBJS) liblpr.la -# $(LINK) ${LPR_OBJS} liblpr.la $(LIBS) -#lpq: $(LPQ_OBJS) liblpr.la -# $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS) -#lpstat: $(LPSTAT_OBJS) liblpr.la -# $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS) -#lprm: $(LPRM_OBJS) liblpr.la -# $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS) -#lpc: $(LPC_OBJS) liblpr.la -# $(LINK) ${LPC_OBJS} liblpr.la $(LIBS) -#checkpc: $(CHECKPC_OBJS) liblpr.la -# $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS) -#lpf: $(LPF_OBJS) liblpr.la -# $(LINK) ${LPF_OBJS} $(LIBS) -#lpbanner: $(LPBANNER_OBJS) liblpr.la -# $(LINK) ${LPBANNER_OBJS} $(LIBS) -#monitor: $(MONITOR_OBJS) liblpr.la -# $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS) - -authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh - rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@ - -sserver: sserver.o liblpr.la - $(LINK) sserver liblpr.la $(LIBS) -sclient: sclient.o liblpr.la - $(LINK) sclient liblpr.la $(LIBS) - -cancel: - rm -f $@; ln -s lprm $@ -lp: lpr - rm -f $@; ln -s lpr $@ +#============================================================================= +# List the directories you want to generate: +# DIRS for all, clean, etc. +# ALLDIRS for other such as documentation +#============================================================================= + +DIRS= UTILS src po man +INSTALLDIRS= UTILS src po man +FILES=./postinstall ./preremove ./postremove ./lpd.conf +ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/DOCS +ROMFSDIR = $(ROOTDIR)/romfs + +############################################################################### + +all: ${DIRS} ${FILES} + +SCRIPTS=init.freebsd init.linux init.redhat init.linuxsb init.solaris ltmain postinstall.freebsd postinstall.generic postinstall.linux postinstall.solaris postremove.generic postremove.solaris preinstall.solaris preremove.freebsd preremove.generic preremove.linux preremove.solaris + +$(SCRIPTS): header + cat header ${SRC}/$@.sh >$@ + chmod 755 $@; + +header: Makefile + @echo "#!/bin/sh" >$@ + @echo PREFIX=$(prefix) >>$@ + @echo LPD_PATH=$(LPD_PATH) >>$@ + @echo INSTALL=\"$(INSTALL)\" >>$@ + @echo LPD_PERMS_PATH=$(LPD_PERMS_PATH) >>$@ + @echo LPD_CONF_PATH=$(LPD_CONF_PATH) >>$@ + @echo PRINTCAP_PATH=$(PRINTCAP_PATH) >>$@ + @echo SYSCONFDIR=$(sysconfdir) >>$@ + @echo SBINDIR=$(sbindir) >>$@ + @echo FILTER_DIR=$(FILTER_DIR) >>$@ + @echo LOCKFILE=$(LOCKFILE) >>$@ + @echo PSHOWALL=\"$(PSHOWALL)\" >>$@ + @echo "VERSION=$(VERSION)" >>$@ + @echo "INIT=$(INIT)" >>$@ + @echo "MANDIR=$(mandir)" >>$@ + +./postinstall: $(SCRIPTS) Makefile + OSNAME=elf; case "elf" in \ + *linux* ) OSNAME=linux;; \ + *freebsd* ) OSNAME=freebsd;; \ + *solaris* ) OSNAME=solaris;; \ + esac; \ + if test -f postinstall.$${OSNAME} ; then s=postinstall.$${OSNAME} ; else s=postinstall.generic; fi; \ + echo POSTINSTALL "'$$s'"; cp $$s postinstall; + +./preremove: $(SCRIPTS) Makefile + OSNAME=elf; case "elf" in *linux* ) OSNAME=linux;; esac; \ + if test -f preremove.$${OSNAME} ; then s=preremove.$${OSNAME} ; else s=preremove.generic; fi; \ + echo PREREMOVE "'$$s'"; cp $$s preremove; + +./postremove: $(SCRIPTS) Makefile + OSNAME=elf; case "elf" in *linux* ) OSNAME=linux;; esac; \ + if test -f postremove.$${OSNAME} ; then s=postremove.$${OSNAME} ; else s=postremove.generic; fi; \ + echo POSTREMOVE "'$$s'"; cp $$s postremove; + +# define default target +.PHONY: all warn TAGS clean uninstall install info dvi check \ + tar send realclean mostlyclean distclean dist update ci cifiles $(ALLDIRS) \ + +MAKETARGET=all + +############################################################################### +$(ALLDIRS): + if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \ + cd $@; $(MAKE) localedir=${LOCALEDIR} \ + DESTDIR=$(DESTDIR) $(MAKETARGET) ; \ + fi + +TAGS clean:: + -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS) -########################################################################### -# lpd.conf - -./lpd.conf: Makefile vars.c - set -e; \ - rm -f $@ ; \ - echo "# lpd.conf" >/tmp/$@.$$$$ ; \ - echo "# VERSION=$(VERSION)" >>/tmp/$@.$$$$ ; \ - $(CPP) $(CFLAGS) -C ${SRC}/common/vars.c \ - | /bin/sh ../UTILS/make_lpd_conf >>/tmp/$@.$$$$ ; \ - chmod 644 /tmp/$@.$$$$ ; \ - cp /tmp/$@.$$$$ $@ ; rm /tmp/$@.$$$$ - -.sh: - set -e ; \ - rm -f $@ ; \ - sed \ - -e "s,@OPENSSL.,/usr/bin/openssl," \ - -e "s,@SSL_CA_FILE.,${sysconfdir}/lpd/ssl.ca/ca.crt," \ - -e "s,@SSL_CA_KEY.,${sysconfdir}/lpd/ssl.ca/ca.key," \ - -e "s,@SSL_CRL_FILE.,${sysconfdir}/lpd/ssl.crl/ssl.crl," \ - -e "s,@SSL_SERVER_CERT.,${sysconfdir}/lpd/ssl.server/server.crt," \ - -e "s,@SSL_SERVER_PASSWORD_FILE.,${sysconfdir}/lpd/ssl.server/server.pwd," \ - -e "s,@SSL_CERTS_DIR.,${sysconfdir}/lpd/ssl.certs," \ - $< >$@ - chmod 755 $@ - -lprng_certs: Makefile lprng_certs.sh -lprng_index_certs: Makefile lprng_index_certs.sh +clean:: + -rm -f header lpd.conf $(FILES) $(SCRIPTS) postinstall preremove postremove a.out + -rm -f *.bak ? ?.* core *.old *~ po/*~ -########################################################################### +#install: all +# $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS) # - -NORM_PERMS=0755 -SUID_ROOT_PERMS=04755 -o root - -########################################################################### +# if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \ +# MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \ +# fi; +# @echo ""; install: all - echo "Clients are being installed NORM_PERMS"; - for i in ${DESTDIR}${bindir} ${DESTDIR}${sbindir} \ - $(DESTDIR)$(libdir) ${DESTDIR}${sysconfdir} \ - ${DESTDIR}${LPD_DIR} ${DESTDIR}${FILTER_DIR}; do \ - if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \ - done; + install -D src/lpd $(INSTALLDIR)/usr/sbin/lpd + $(STRIP) $(INSTALLDIR)/usr/sbin/lpd - ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpq ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lprm ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpr ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpstat ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpc ${DESTDIR}${sbindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_certs ${DESTDIR}${sbindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_index_certs ${DESTDIR}${sbindir} - cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel; +info dvi check: -uninstall: +./lpd.conf: src/lpd.conf + cp src/lpd.conf $@ + chmod 644 $@ -########################################################################### - - -clean:: - -rm -rf *.o *.tmp *core *.a ? ?.bak ?.orig $(TARGET) $(NONTARGET) st[0-9]* \ - tags ./lpd.conf */*.old */*.bak */*.orig .libs *.lo *.la log defs.h - -realclean mostlyclean distclean:: clean - -rm -f Makefile Makefile.bsd pclbanner psbanner +src/lpd.conf: + cd src; $(MAKE) MAKETARGET=lpd.conf -info: -tags TAGS: - ctags -t -d `ls common/*.c include/*.h | sed -e '/checkpc.c/d' ` +realclean mostlyclean distclean: clean + rm -rf DISTRIBUTIONS/FreeBSD*/work DISTRIBUTIONS/FreeBSD*/*.tgz ; + $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(ALLDIRS) + rm -f `find . -type f -name '*.old' -print` \ + `find . -type f -name '*.bak' -print` \ + `find . -type f -name '*.orig' -print` \ + configure.lineno config.cache config.log config.status lpd.conf libtool \ + Makefile */Makefile po/POTFILES + rm -f `find . -type f -name '*.in' -print | sed -e 's/\.in$$//' -e /configure/d ` -########################################################################### +############################################################################### +uninstall: + echo "you must uninstall by hand" + +ci: cifiles + for i in $(ALLDIRS); do \ + case $$i in \ + po ) ;; \ + * ) $(MAKE) MAKETARGET=$@ $$i ;; \ + esac; \ + done; + chmod 755 `find . -name install-sh -print` + chmod 755 `find . -name mkinstalldirs -print` -CI= +#CI= #CO=-kv CO=-l cifiles: - if [ ! -d RCS ] ; then mkdir RCS ; fi ; - checkin() { \ - (set +e; rcs -l $$1; exit 0); \ - ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ - }; \ - for i in *; do \ - if [ -f "$$i" ] ; then \ - case $$i in \ - Makefile*|*install* ) echo $$i; checkin $$i ;; \ - *.in ) echo $$i; checkin $$i ;; \ - esac; \ + for i in . $(ALLDIRS); do \ + if test ! -d $$i/RCS ; then \ + mkdir $$i/RCS; \ fi; \ done; - -cifast ci: cifiles checkin() { \ (set +e; rcs -l $$1; exit 0); \ ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ }; \ - for i in *; do \ - if [ -d "$$i" ] ; then \ - case $$i in \ - RCS ) ;; \ - * ) if [ ! -d $$i/RCS ] ; then mkdir $$i/RCS ; fi ; \ - for j in $$i/*; do \ - if [ -f "$$j" ] ; then \ - checkin $$j; \ - fi; \ - done; \ - ;; \ + for i in * */Makefile po/* ; do \ + if test -f "$$i" ; then \ + case "$$i" in \ + *.mo ) ;; \ + config.* ) ;; \ + configure ) ;; \ + * ) checkin $$i ;; \ esac; \ fi; \ done; -depend: /tmp/dep /tmp/order - ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile.in; \ - echo ; echo; \ - echo "########### LIBRARY ORDER #########"; \ - cat /tmp/order; \ - echo ; echo; \ - echo "########### DEPENDENCIES #########"; \ - cat /tmp/dep; ) >/tmp/Makefile.in - mv ${SRC}/Makefile.in ${SRC}/Makefile.in.old - cp /tmp/Makefile.in ${SRC}/Makefile.in - ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile; \ - echo ; echo; \ - echo "########### LIBRARY ORDER #########"; \ - cat /tmp/order; \ - echo ; echo; \ - echo "########### DEPENDENCIES #########"; \ - cat /tmp/dep; ) >/tmp/Makefile - mv ${SRC}/Makefile ${SRC}/Makefile.old - cp /tmp/Makefile ${SRC}/Makefile - -/tmp/dep:: Makefile -/tmp/dep:: $(ALL_OBJS) - CFLAGS="${CFLAGS}" ${SRC}/../UTILS/makeinc $(ALL_OBJS) >$@ - -# make the order in which library files should be loader -# this requires hand tuning the makefile, but it is easier than -# trying to fix up things with conditional tests +############################################################################### +# Update the patch level when you make a new version +# do this before you start changes +# Don't even think about making this configurable, it is for +# distribution and update purposes only! +# Patrick Powell +############################################################################### + +update: + rm -f src/include/license.h src/include/copyright.h + sed -e 's/"/\\"/g' -e 's/.*/"&",/' LICENSE >src/include/license.h + sed -e 's/"/\\"/g' -e 's/.*/"&",/' COPYRIGHT >src/include/copyright.h + for i in VERSION ./src/include/patchlevel.h configure.in ; do \ + rcs -l $$i; chmod +w $$i; \ + done; + if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ + if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ + DIR=`echo $${DIR} | sed 's,.*/,,'`; \ + DIRVER=` echo $${DIR} | sed 's,.*-,,'`; \ + echo DIR $${DIR}, DIRVER $${DIRVER}; \ + echo "#define PATCHLEVEL \"$${DIR}\"" >./src/include/patchlevel.h; \ + echo $${DIR} >VERSION; \ + S=`echo *.sh | sed -e 's/\.sh//g'`; \ + perl -spi -e "s,=.*,=$${DIRVER}, if(/^VERSION=/ or /^#.* VERSION=/); \ + s,^DISTNAME=.*,DISTNAME=$${DIR},; \ + s,^PORTNAME=.*,PORTNAME=$(PACKAGE),; \ + s,^PORTVERSION=.*,PORTVERSION=$${DIRVER},; \ + s,package name \".*\",package name \"$${DIR}\",; \ + s,^SCRIPTS=.*,SCRIPTS=$$S,;" \ + configure.in lpd.perms.in \ + DISTRIBUTIONS/*/Makefile \ + po/Makefile.in.in printcap + perl -spi -e 's,.*,"Project-Id-Version: $(PACKAGE) $(VERSION)\\n", if(/^"Project-Id/);' \ + po/*.po + sh CREATE_CONFIGURE + sh STANDARD_configuration +# ci $(CI) -l -f -mUpdate -t-Initial Makefile DOCS/Makefile src/Makefile + for i in DOCS man ; do \ + (cd $$i ; $(MAKE) $@ ); \ + done; + for i in po ; do \ + (cd $$i ; $(MAKE) update-po ); \ + done + +############################################################################### +# Make a gnutar distribution +# - note that not all the source tree is sent out # -/tmp/order:: Makefile -/tmp/order:: $(LIBLPR_OBJS) - lorder ` echo $(LIBLPR_OBJS) | sed -e 's/\.lo/.o/g'` |tsort >/tmp/raw - awk '\ - BEGIN { print "LIBLPR_ORDER = \\"; } \ - { line = line " " $$0; \ - if( ++i >= 4 ){ \ - print "\t" line "\\"; \ - line = ""; \ - i = 0; \ - } \ - } \ - END { \ - if( line != "" ){ \ - print "\t" line; \ - } \ - }' /tmp/raw >/tmp/order - - -############# GENERATED ################################################### - - -########### LIBRARY ORDER ######### -LIBLPR_ORDER = \ - krb5_auth.o initialize.o getopt.o copyright.o\ - proctitle.o utilities.o user_auth.o md5.o\ - ssl_auth.o stty.o sendreq.o sendmail.o\ - sendjob.o sendauth.o printjob.o permission.o\ - merge.o lpd_status.o lpd_secure.o lpd_remove.o\ - lpd_rcvjob.o lpd_logger.o lpd_jobs.o lockfile.o\ - accounting.o lpd_dispatch.o lpd_control.o debug.o\ - controlword.o linksupport.o linelist.o gethostinfo.o\ - globmatch.o getqueue.o getprinter.o fileopen.o\ - errormsg.o child.o vars.o plp_snprintf.o\ - - -########### DEPENDENCIES ######### -accounting.o accounting.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -child.o child.lo : config.h child.h debug.h errormsg.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -controlword.o controlword.lo : config.h control.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -copyright.o copyright.lo : config.h copyright.h debug.h errormsg.h license.h linelist.h lp.h patchlevel.h plp_snprintf.h portable.h utilities.h utilities.h -debug.o debug.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -errormsg.o errormsg.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -fileopen.o fileopen.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -gethostinfo.o gethostinfo.lo : config.h debug.h errormsg.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getprinter.o getprinter.lo : config.h child.h debug.h errormsg.h gethostinfo.h getprinter.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getqueue.o getqueue.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h merge.h permission.h plp_snprintf.h portable.h utilities.h utilities.h -globmatch.o globmatch.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -initialize.o initialize.lo : config.h defs.h child.h debug.h errorcodes.h errormsg.h gethostinfo.h getopt.h getqueue.h initialize.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -krb5_auth.o krb5_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h permission.h plp_snprintf.h portable.h utilities.h utilities.h -linelist.o linelist.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_dispatch.h lpd_jobs.h lpd_logger.h plp_snprintf.h portable.h utilities.h utilities.h -linksupport.o linksupport.lo : config.h debug.h errorcodes.h errormsg.h gethostinfo.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -lockfile.o lockfile.lo : config.h debug.h errormsg.h fileopen.h linelist.h lockfile.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -lpd_control.o lpd_control.lo : config.h child.h control.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_control.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_dispatch.o lpd_dispatch.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_control.h lpd_dispatch.h lpd_rcvjob.h lpd_remove.h lpd_secure.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_jobs.o lpd_jobs.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h merge.h permission.h plp_snprintf.h portable.h printjob.h proctitle.h sendjob.h sendmail.h stty.h utilities.h utilities.h -lpd_logger.o lpd_logger.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lp.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_rcvjob.o lpd_rcvjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_remove.o lpd_remove.lo : config.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h lp.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h -sendauth.o sendauth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h -lpd_secure.o lpd_secure.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_jobs.h lpd_rcvjob.h lpd_secure.h permission.h plp_snprintf.h portable.h proctitle.h user_auth.h utilities.h utilities.h -lpd_status.o lpd_status.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h lpd_jobs.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h -merge.o merge.lo : config.h debug.h errormsg.h linelist.h lp.h merge.h plp_snprintf.h portable.h utilities.h utilities.h -permission.o permission.lo : config.h debug.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h utilities.h utilities.h -plp_snprintf.o plp_snprintf.lo : config.h config.h -printjob.o printjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h -proctitle.o proctitle.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -sendjob.o sendjob.lo : config.h accounting.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h -sendmail.o sendmail.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h sendmail.h utilities.h utilities.h -sendreq.o sendreq.lo : config.h child.h debug.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h readstatus.h sendauth.h sendreq.h user_auth.h utilities.h utilities.h -ssl_auth.o ssl_auth.lo : config.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h lpd_secure.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h -stty.o stty.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h stty.h utilities.h utilities.h -user_auth.o user_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h md5.h permission.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h -utilities.o utilities.lo : config.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -vars.o vars.lo : config.h defs.h accounting.h child.h debug.h errormsg.h gethostinfo.h getqueue.h linelist.h lp.h permission.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h -md5.o md5.lo : md5.h md5.h -lpr.o lpr.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpd_jobs.h lpr.h patchlevel.h plp_snprintf.h portable.h printjob.h sendjob.h utilities.h utilities.h -lpq.o lpq.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpq.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h -lpc.o lpc.lo : config.h defs.h child.h control.h debug.h errorcodes.h errormsg.h getopt.h getprinter.h initialize.h linelist.h lp.h lpc.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h -lprm.o lprm.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lprm.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h -lpd.o lpd.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -checkpc.o checkpc.lo : config.h defs.h checkpc.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd_remove.h patchlevel.h plp_snprintf.h portable.h proctitle.h stty.h utilities.h utilities.h -lpf.o lpf.lo : config.h portable.h portable.h -plp_snprintf.o plp_snprintf.lo : config.h config.h -monitor.o monitor.lo : config.h debug.h errormsg.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -lpbanner.o lpbanner.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -plp_snprintf.o plp_snprintf.lo : config.h config.h +############################################################################### + +tar: distclean + rm -f */Makefile Makefile + chmod 755 `find . -name install-sh -print` + chmod 755 `find . -name mkinstalldirs -print` + chmod -R +w . + if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ + if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ + echo $${DIR}; \ + DIR=`echo $${DIR} | sed 's,.*/,,'`; \ + cd ..; \ + tar '--exclude=RCS' -zcf $${DIR}.tgz $${DIR}; \ + md5 $${DIR}.tgz | pgp -fast -u papowell@lprng > $${DIR}.tgz.md5 + @echo "" + +configure: configure.in + autoconf + autoheader + +dist: update ci distclean tar send +redist: ci distclean tar send + +send: + if [ -f ../SENDTO ] ; then (cd ..; sh SENDTO) ; fi diff --git a/trunk/user/LPRng/src/Makefile.in b/trunk/user/LPRng/src/Makefile.in index 31e46f9cba3..096dd104ba6 100644 --- a/trunk/user/LPRng/src/Makefile.in +++ b/trunk/user/LPRng/src/Makefile.in @@ -1,62 +1,26 @@ -########################################################################## +########################################################################### # LPRng - An Extended Print Spooler System # -# Copyright 1988-2001 Patrick Powell, San Diego, California +# Copyright 1988-2001 Patrick Powell, San Diego, CA # papowell@lprng.com # See LICENSE for conditions of use. # ########################################################################### -# MODULE: Makefile -# Makefile.in,v 1.1 2001/08/21 20:33:17 root Exp -########################################################################### -# - -#************** GENERAL CONFIGURATION INFORMATION ************************ -# where user commands are installed: lpr, lpq, lprm, lpc. -# Also the SysV emulation commands: lp, lpstat. -# If these paths are /usr/lib, /usr/ucb etc., make sure you -# have backup copies of the system version! -# -# -# These are automatically sedded in by the "configure" script, but you -# may need to change them if you're on a strange version of UNIX. +# MODULE: Makefile.in +# PURPOSE: top level Makefile for LPD Software +# $Id: Makefile.in,v 1.1.1.1 2008/10/15 03:28:09 james26_jang Exp $ +########################################################################## +#**************###########************** +# You must use ANSI C and GNU Make! +#*************************************** PACKAGE=@PACKAGE@ VERSION=@VERSION@ - -# where the source directory is SRC=@srcdir@ -top_srcdir=@top_srcdir@ -top_builddir=.. -# which make we are using @SET_MAKE@ +INSTALL=@INSTALL@ -# what C compiler to use. -CC:=@CC@ - -# what command to use to "ranlib" or "lorder" the library. -RANLIB=@RANLIB@ - -# what C preprocessor to use. -CPP:=@CPP@ - -# how to install stuff. -INSTALLCMD=@INSTALL@ -# a shell interpreter that's as close to the POSIX shell as possible. -SHELL_PATH=@SHELL@ -SHELL = @SHELL@ - -# loader for c programs -LDCC=@LDCC@ - -# any libs that need to be used to get these programs to compile: -LIBS= @LIBS@ @LTLIBINTL@ - -# what libtool -LIBTOOL=@LIBTOOL@ - -### PATHS #### # prefix prefix=@prefix@ # exec prefix @@ -69,470 +33,237 @@ sbindir=@sbindir@ libexecdir=@libexecdir@ # for the configuration stuff sysconfdir=@sysconfdir@ -# libraries -libdir=@libdir@ - -# install options - -STRIP=@STRIP_OPTION@ - -CFLAGS:= \ - -I${top_builddir} -I. \ - -I${SRC}/include -I${SRC}/common \ - @CPPFLAGS@ @CFLAGS@ @DEFS@ - -USER_OBJS := @USER_OBJS@ -LDFLAGS := @LDFLAGS@ - -FILTER_DIR = @FILTER_DIR@ -LPD_DIR = @LPD_DIR@ - - -#********************** End of configure modifiable settings ************ - - -#********************** OPTIONAL DEFINITIONS **************************** -# These are various flags and settings that will be used by the -# compiler to generate code -# - -#### ****** TESTING AND SECURITY LOOPHOLE ****************************** -# Define G ETENV to allow the LPD_CONFIG environment -# variable to be used as the name of a configuration file. In non-testing -# systems, this is a security loophole. -#CFLAGS:= $(CFLAGS) -DGETENV=\"1\" - -# Set location of configuration, permissions, and printcap file -# -#GNU - -# CFLAGS:= $(CFLAGS) -DFORMAT_TEST -Wformat - - -##### DMalloc Debugging Package -# -#CFLAGS:= $(CFLAGS) -DDMALLOC -#LIBS:= $(LIBS) -ldmalloc - - - -#********************* OVERRIDING CONFIGURES' GUESSES ****************** -# -# -# If you get errors similar to the ones below, it may be -# because "configure" guessed wrong. You can override the -# guesses here, by uncommenting the appropriate line... - -# "recvfiles.c: unknown struct fsb has no size": -# define STATFS: to use statfs(2) (BSD) -# STATVFS: to use statvfs(2) (SVR4) -# others for system specific cases -# -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=ULTRIX_STATFS -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=SVR3_STATFS -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATVFS -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATFS - -# define MAKE_USE_STTY = -# SGTTYB to use struct sgttyb and (BSD) -# TERMIO to use struct termio and (old sysV) -# TERMIOS to use struct termios and (SVR4) -# -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=SGTTYB -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIO -# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIOS - -# a better way to do this is to edit the "ARGH" section of portable.h, -# and add the appropriate lines to the section for your OS, or add a new -# section if one doesn't exist; then you can send me the patches and -# I'll incorporate them into the distribution. - -# -# You might discover that the default locking mechanism -# does not work. Try one of the following to override the -# configured value: fcntl(), lockf(), flock(), and 0 to suppress locking -# -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_fcntl -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_lockf -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_flock -# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=0 -# - -# SETPROCTITLE - overwrites the program argument information -# when ps is used, displays status. Used only by LPD -# if this does not work, define the following -# CFLAGS:= $(CFLAGS) -DNO_SETPROCTITLE - - -SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE -INCLUDE=.. ${SRC}/include - -VPATH=..:.:${SRC}/include:${SRC}/common:${SRC} - -######################################################################## - -.SUFFIXES: .lo .sh -LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@ -.c.lo: - $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< - -#********************** End of Configurable Part **************************** - -TARGET= \ - lprng_certs lprng_index_certs \ - lpc lpd lpq lpr lprm lpf checkpc lp lpstat \ - lpbanner monitor ./lpd.conf - -NONTARGET = sserver sclient - -LPD_OBJS= lpd.o -LPR_OBJS= lpr.o -LPQ_OBJS= lpq.o -LPSTAT_OBJS= lpstat.o -LPRM_OBJS= lprm.o -LPC_OBJS= lpc.o -CHECKPC_OBJS = checkpc.o -LPF_OBJS = lpf.o plp_snprintf.o -MONITOR_OBJS= monitor.o getopt.o -LPBANNER_OBJS= lpbanner.o plp_snprintf.o - -LIBLPR_OBJS = \ - accounting.lo child.lo controlword.lo copyright.lo \ - debug.lo errormsg.lo fileopen.lo gethostinfo.lo \ - getopt.lo getprinter.lo getqueue.lo globmatch.lo \ - initialize.lo krb5_auth.lo \ - linelist.lo linksupport.lo lockfile.lo \ - lpd_control.lo lpd_dispatch.lo lpd_jobs.lo lpd_logger.lo lpd_rcvjob.lo \ - lpd_remove.lo sendauth.lo lpd_secure.lo lpd_status.lo \ - merge.lo permission.lo plp_snprintf.lo printjob.lo \ - proctitle.lo sendjob.lo sendmail.lo sendreq.lo ssl_auth.lo \ - stty.lo user_auth.lo utilities.lo vars.lo md5.lo $(USER_OBJS) - -ALL_OBJS = $(LIBLPR_OBJS) \ - $(LPR_OBJS) $(LPQ_OBJS) $(LPC_OBJS) $(LPRM_OBJS) $(LPD_OBJS) \ - $(CHECKPC_OBJS) $(LPF_OBJS) $(LPRACCNT_OBJS) $(MONITOR_OBJS) $(LPBANNER_OBJS) - -all: $(TARGET) - -relink: - rm -f ${TARGET} - -defs.h: Makefile - cp /dev/null $@ - echo "#define " CHOWN \"@CHOWN@\" >>$@ - echo "#define " CHGRP \"@CHGRP@\" >>$@ - echo "#define " PRINTCAP_PATH \"@PRINTCAP_PATH@\" >>$@ - echo "#define " LPD_PRINTCAP_PATH \"@LPD_PRINTCAP_PATH@\" >>$@ - echo "#define " LPD_PERMS_PATH \"@LPD_PERMS_PATH@\" >>$@ - echo "#define " LPD_CONF_PATH \"@LPD_CONF_PATH@\" >>$@ - echo "#define " REQUIRE_CONFIGFILES \"@REQUIRE_CONFIGFILES@\" >>$@ - echo "#define " FILTER_PATH \"@FILTER_PATH@\" >>$@ - echo "#define " LD_LIBRARY_PATH \"@LD_LIBRARY_PATH@\" >>$@ - echo "#define " LOCKFILE \"@LOCKFILE@\" >>$@ - echo "#define " CLEAR \"@CLEAR@\" >>$@ - echo "#define " USERID \"@USERID@\" >>$@ - echo "#define " GROUPID \"@GROUPID@\" >>$@ - echo "#define " LOCALEDIR \"@LOCALEDIR@\" >>$@ - echo "#define " DONE_JOBS \"@DONE_JOBS@\" >>$@ - echo "#define " DONE_JOBS_MAX_AGE \"@DONE_JOBS_MAX_AGE@\" >>$@ - echo "#define " UNIXSOCKETPATH \"@UNIXSOCKETPATH@\" >>$@ - echo "#define " PRUTIL \"@PRUTIL@\" >>$@ - echo "#define " OPENSSL \"@OPENSSL@\" >>$@ - echo "#define " SSL_CA_FILE \"@SSL_CA_FILE@\" >>$@ - echo "#define " SSL_CA_KEY \"@SSL_CA_KEY@\" >>$@ - echo "#define " SSL_CRL_FILE \"@SSL_CRL_FILE@\" >>$@ - echo "#define " SSL_CERTS_DIR \"@SSL_CERTS_DIR@\" >>$@ - echo "#define " SSL_SERVER_CERT \"@SSL_SERVER_CERT@\" >>$@ - echo "#define " SSL_SERVER_PASSWORD_FILE \"@SSL_SERVER_PASSWORD_FILE@\" >>$@ - -.PHONY: all ci clean \ - uninstall realclean mostlyclean distclean \ - TAGS info generate - -# we want to force defaults to be updated whenever we -# change the options in Makefile or Makefile.bsd -#GNU -vars.o vars.lo: Makefile -# -#BSD vars.o: Makefile.bsd - -# -# use RANLIB with no ordering, or lorder/tsort if it is there -# if you do not have either, fall back and just build archive -# This appears to cover all cases for portability -# - - -liblpr.la: $(LIBLPR_OBJS) - $(LINK) $(LIBLPR_OBJS) -rpath ${libdir} - -lpd: $(LPD_OBJS) liblpr.la - $(LINK) ${LPD_OBJS} liblpr.la $(LIBS) -lpr: $(LPR_OBJS) liblpr.la - $(LINK) ${LPR_OBJS} liblpr.la $(LIBS) -lpq: $(LPQ_OBJS) liblpr.la - $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS) -lpstat: $(LPSTAT_OBJS) liblpr.la - $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS) -lprm: $(LPRM_OBJS) liblpr.la - $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS) -lpc: $(LPC_OBJS) liblpr.la - $(LINK) ${LPC_OBJS} liblpr.la $(LIBS) -checkpc: $(CHECKPC_OBJS) liblpr.la - $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS) -lpf: $(LPF_OBJS) liblpr.la - $(LINK) ${LPF_OBJS} $(LIBS) -lpbanner: $(LPBANNER_OBJS) liblpr.la - $(LINK) ${LPBANNER_OBJS} $(LIBS) -monitor: $(MONITOR_OBJS) liblpr.la - $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS) - -authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh - rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@ - -sserver: sserver.o liblpr.la - $(LINK) sserver liblpr.la $(LIBS) -sclient: sclient.o liblpr.la - $(LINK) sclient liblpr.la $(LIBS) - -cancel: - rm -f $@; ln -s lprm $@ -lp: lpr - rm -f $@; ln -s lpr $@ - -########################################################################### -# lpd.conf - -./lpd.conf: Makefile vars.c - set -e; \ - rm -f $@ ; \ - echo "# lpd.conf" >/tmp/$@.$$$$ ; \ - echo "# VERSION=$(VERSION)" >>/tmp/$@.$$$$ ; \ - $(CPP) $(CFLAGS) -C ${SRC}/common/vars.c \ - | /bin/sh ../UTILS/make_lpd_conf >>/tmp/$@.$$$$ ; \ - chmod 644 /tmp/$@.$$$$ ; \ - cp /tmp/$@.$$$$ $@ ; rm /tmp/$@.$$$$ - -.sh: - set -e ; \ - rm -f $@ ; \ - sed \ - -e "s,@OPENSSL.,@OPENSSL@," \ - -e "s,@SSL_CA_FILE.,@SSL_CA_FILE@," \ - -e "s,@SSL_CA_KEY.,@SSL_CA_KEY@," \ - -e "s,@SSL_CRL_FILE.,@SSL_CRL_FILE@," \ - -e "s,@SSL_SERVER_CERT.,@SSL_SERVER_CERT@," \ - -e "s,@SSL_SERVER_PASSWORD_FILE.,@SSL_SERVER_PASSWORD_FILE@," \ - -e "s,@SSL_CERTS_DIR.,@SSL_CERTS_DIR@," \ - $< >$@ - chmod 755 $@ - -lprng_certs: Makefile lprng_certs.sh -lprng_index_certs: Makefile lprng_index_certs.sh - -########################################################################### -# +# for the man pages +mandir=@mandir@ +# top build directory +top_builddir=. + +LPD_PERMS_PATH=\"@LPD_PERMS_PATH@\" +LPD_CONF_PATH=\"@LPD_CONF_PATH@\" +PRINTCAP_PATH=\"@PRINTCAP_PATH@\" +LPD_PATH=\"@LPD_DIR@/lpd\" +SHELL="@SHELL@" +LOCKFILE=\"@LOCKFILE@\" +PSHOWALL="@PSHOWALL@" +FILTER_DIR=@FILTER_DIR@ +LOCALEDIR=@LOCALEDIR@ +INIT=@INIT@ +USE_NLS=@USE_NLS@ +LIBTOOL=@LIBTOOL@ -NORM_PERMS=0755 -SUID_ROOT_PERMS=04755 -o root +#============================================================================= +# List the directories you want to generate: +# DIRS for all, clean, etc. +# ALLDIRS for other such as documentation +#============================================================================= + +DIRS= UTILS src po man +INSTALLDIRS= UTILS src po man +FILES=./postinstall ./preremove ./postremove ./lpd.conf +ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/DOCS + +############################################################################### + +all: ${DIRS} ${FILES} + +SCRIPTS=init.freebsd init.linux init.redhat init.linuxsb init.solaris ltmain postinstall.freebsd postinstall.generic postinstall.linux postinstall.solaris postremove.generic postremove.solaris preinstall.solaris preremove.freebsd preremove.generic preremove.linux preremove.solaris + +$(SCRIPTS): header + cat header ${SRC}/$@.sh >$@ + chmod 755 $@; + +header: Makefile + @echo "#!@SHELL@" >$@ + @echo PREFIX=$(prefix) >>$@ + @echo LPD_PATH=$(LPD_PATH) >>$@ + @echo INSTALL=\"$(INSTALL)\" >>$@ + @echo LPD_PERMS_PATH=$(LPD_PERMS_PATH) >>$@ + @echo LPD_CONF_PATH=$(LPD_CONF_PATH) >>$@ + @echo PRINTCAP_PATH=$(PRINTCAP_PATH) >>$@ + @echo SYSCONFDIR=$(sysconfdir) >>$@ + @echo SBINDIR=$(sbindir) >>$@ + @echo FILTER_DIR=$(FILTER_DIR) >>$@ + @echo LOCKFILE=$(LOCKFILE) >>$@ + @echo PSHOWALL=\"$(PSHOWALL)\" >>$@ + @echo "VERSION=$(VERSION)" >>$@ + @echo "INIT=$(INIT)" >>$@ + @echo "MANDIR=$(mandir)" >>$@ + +./postinstall: $(SCRIPTS) Makefile + OSNAME=@OSNAME@; case "@OSNAME@" in \ + *linux* ) OSNAME=linux;; \ + *freebsd* ) OSNAME=freebsd;; \ + *solaris* ) OSNAME=solaris;; \ + esac; \ + if test -f postinstall.$${OSNAME} ; then s=postinstall.$${OSNAME} ; else s=postinstall.generic; fi; \ + echo POSTINSTALL "'$$s'"; cp $$s postinstall; + +./preremove: $(SCRIPTS) Makefile + OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; \ + if test -f preremove.$${OSNAME} ; then s=preremove.$${OSNAME} ; else s=preremove.generic; fi; \ + echo PREREMOVE "'$$s'"; cp $$s preremove; + +./postremove: $(SCRIPTS) Makefile + OSNAME=@OSNAME@; case "@OSNAME@" in *linux* ) OSNAME=linux;; esac; \ + if test -f postremove.$${OSNAME} ; then s=postremove.$${OSNAME} ; else s=postremove.generic; fi; \ + echo POSTREMOVE "'$$s'"; cp $$s postremove; + +# define default target +.PHONY: all warn TAGS clean uninstall install info dvi check \ + tar send realclean mostlyclean distclean dist update ci cifiles $(ALLDIRS) \ + +MAKETARGET=all + +############################################################################### +$(ALLDIRS): + if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \ + cd $@; $(MAKE) localedir=${LOCALEDIR} \ + DESTDIR=$(DESTDIR) $(MAKETARGET) ; \ + fi + +TAGS clean:: + -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS) -########################################################################### +clean:: + -rm -f header lpd.conf $(FILES) $(SCRIPTS) postinstall preremove postremove a.out + -rm -f *.bak ? ?.* core *.old *~ po/*~ install: all - echo "Clients are being installed @PERMS@"; - for i in ${DESTDIR}${bindir} ${DESTDIR}${sbindir} \ - $(DESTDIR)$(libdir) ${DESTDIR}${sysconfdir} \ - ${DESTDIR}${LPD_DIR} ${DESTDIR}${FILTER_DIR}; do \ - if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \ - done; - - ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR} - ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_certs ${DESTDIR}${sbindir} - ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_index_certs ${DESTDIR}${sbindir} - cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel; - -uninstall: + $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS) -########################################################################### + if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \ + MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \ + fi; + @echo ""; +info dvi check: -clean:: - -rm -rf *.o *.tmp *core *.a ? ?.bak ?.orig $(TARGET) $(NONTARGET) st[0-9]* \ - tags ./lpd.conf */*.old */*.bak */*.orig .libs *.lo *.la log defs.h +./lpd.conf: src/lpd.conf + cp src/lpd.conf $@ + chmod 644 $@ -realclean mostlyclean distclean:: clean - -rm -f Makefile Makefile.bsd pclbanner psbanner +src/lpd.conf: + cd src; $(MAKE) MAKETARGET=lpd.conf -info: -tags TAGS: - ctags -t -d `ls common/*.c include/*.h | sed -e '/checkpc.c/d' ` +realclean mostlyclean distclean: clean + rm -rf DISTRIBUTIONS/FreeBSD*/work DISTRIBUTIONS/FreeBSD*/*.tgz ; + $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(ALLDIRS) + rm -f `find . -type f -name '*.old' -print` \ + `find . -type f -name '*.bak' -print` \ + `find . -type f -name '*.orig' -print` \ + configure.lineno config.cache config.log config.status lpd.conf libtool \ + Makefile */Makefile po/POTFILES + rm -f `find . -type f -name '*.in' -print | sed -e 's/\.in$$//' -e /configure/d ` -########################################################################### +############################################################################### +uninstall: + echo "you must uninstall by hand" + +ci: cifiles + for i in $(ALLDIRS); do \ + case $$i in \ + po ) ;; \ + * ) $(MAKE) MAKETARGET=$@ $$i ;; \ + esac; \ + done; + chmod 755 `find . -name install-sh -print` + chmod 755 `find . -name mkinstalldirs -print` -CI= +#CI= #CO=-kv CO=-l cifiles: - if [ ! -d RCS ] ; then mkdir RCS ; fi ; - checkin() { \ - (set +e; rcs -l $$1; exit 0); \ - ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ - }; \ - for i in *; do \ - if [ -f "$$i" ] ; then \ - case $$i in \ - Makefile*|*install* ) echo $$i; checkin $$i ;; \ - *.in ) echo $$i; checkin $$i ;; \ - esac; \ + for i in . $(ALLDIRS); do \ + if test ! -d $$i/RCS ; then \ + mkdir $$i/RCS; \ fi; \ done; - -cifast ci: cifiles checkin() { \ (set +e; rcs -l $$1; exit 0); \ ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ }; \ - for i in *; do \ - if [ -d "$$i" ] ; then \ - case $$i in \ - RCS ) ;; \ - * ) if [ ! -d $$i/RCS ] ; then mkdir $$i/RCS ; fi ; \ - for j in $$i/*; do \ - if [ -f "$$j" ] ; then \ - checkin $$j; \ - fi; \ - done; \ - ;; \ + for i in * */Makefile po/* ; do \ + if test -f "$$i" ; then \ + case "$$i" in \ + *.mo ) ;; \ + config.* ) ;; \ + configure ) ;; \ + * ) checkin $$i ;; \ esac; \ fi; \ done; -depend: /tmp/dep /tmp/order - ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile.in; \ - echo ; echo; \ - echo "########### LIBRARY ORDER #########"; \ - cat /tmp/order; \ - echo ; echo; \ - echo "########### DEPENDENCIES #########"; \ - cat /tmp/dep; ) >/tmp/Makefile.in - mv ${SRC}/Makefile.in ${SRC}/Makefile.in.old - cp /tmp/Makefile.in ${SRC}/Makefile.in - ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile; \ - echo ; echo; \ - echo "########### LIBRARY ORDER #########"; \ - cat /tmp/order; \ - echo ; echo; \ - echo "########### DEPENDENCIES #########"; \ - cat /tmp/dep; ) >/tmp/Makefile - mv ${SRC}/Makefile ${SRC}/Makefile.old - cp /tmp/Makefile ${SRC}/Makefile - -/tmp/dep:: Makefile -/tmp/dep:: $(ALL_OBJS) - CFLAGS="${CFLAGS}" ${SRC}/../UTILS/makeinc $(ALL_OBJS) >$@ - -# make the order in which library files should be loader -# this requires hand tuning the makefile, but it is easier than -# trying to fix up things with conditional tests +############################################################################### +# Update the patch level when you make a new version +# do this before you start changes +# Don't even think about making this configurable, it is for +# distribution and update purposes only! +# Patrick Powell +############################################################################### + +update: + rm -f src/include/license.h src/include/copyright.h + sed -e 's/"/\\"/g' -e 's/.*/"&",/' LICENSE >src/include/license.h + sed -e 's/"/\\"/g' -e 's/.*/"&",/' COPYRIGHT >src/include/copyright.h + for i in VERSION ./src/include/patchlevel.h configure.in ; do \ + rcs -l $$i; chmod +w $$i; \ + done; + if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ + if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ + DIR=`echo $${DIR} | sed 's,.*/,,'`; \ + DIRVER=` echo $${DIR} | sed 's,.*-,,'`; \ + echo DIR $${DIR}, DIRVER $${DIRVER}; \ + echo "#define PATCHLEVEL \"$${DIR}\"" >./src/include/patchlevel.h; \ + echo $${DIR} >VERSION; \ + S=`echo *.sh | sed -e 's/\.sh//g'`; \ + perl -spi -e "s,=.*,=$${DIRVER}, if(/^VERSION=/ or /^#.* VERSION=/); \ + s,^DISTNAME=.*,DISTNAME=$${DIR},; \ + s,^PORTNAME=.*,PORTNAME=$(PACKAGE),; \ + s,^PORTVERSION=.*,PORTVERSION=$${DIRVER},; \ + s,package name \".*\",package name \"$${DIR}\",; \ + s,^SCRIPTS=.*,SCRIPTS=$$S,;" \ + configure.in lpd.perms.in \ + DISTRIBUTIONS/*/Makefile \ + po/Makefile.in.in printcap + perl -spi -e 's,.*,"Project-Id-Version: $(PACKAGE) $(VERSION)\\n", if(/^"Project-Id/);' \ + po/*.po + sh CREATE_CONFIGURE + sh STANDARD_configuration +# ci $(CI) -l -f -mUpdate -t-Initial Makefile DOCS/Makefile src/Makefile + for i in DOCS man ; do \ + (cd $$i ; $(MAKE) $@ ); \ + done; + for i in po ; do \ + (cd $$i ; $(MAKE) update-po ); \ + done + +############################################################################### +# Make a gnutar distribution +# - note that not all the source tree is sent out # -/tmp/order:: Makefile -/tmp/order:: $(LIBLPR_OBJS) - lorder ` echo $(LIBLPR_OBJS) | sed -e 's/\.lo/.o/g'` |tsort >/tmp/raw - awk '\ - BEGIN { print "LIBLPR_ORDER = \\"; } \ - { line = line " " $$0; \ - if( ++i >= 4 ){ \ - print "\t" line "\\"; \ - line = ""; \ - i = 0; \ - } \ - } \ - END { \ - if( line != "" ){ \ - print "\t" line; \ - } \ - }' /tmp/raw >/tmp/order - - -############# GENERATED ################################################### - - -########### LIBRARY ORDER ######### -LIBLPR_ORDER = \ - krb5_auth.o initialize.o getopt.o copyright.o\ - proctitle.o utilities.o user_auth.o md5.o\ - ssl_auth.o stty.o sendreq.o sendmail.o\ - sendjob.o sendauth.o printjob.o permission.o\ - merge.o lpd_status.o lpd_secure.o lpd_remove.o\ - lpd_rcvjob.o lpd_logger.o lpd_jobs.o lockfile.o\ - accounting.o lpd_dispatch.o lpd_control.o debug.o\ - controlword.o linksupport.o linelist.o gethostinfo.o\ - globmatch.o getqueue.o getprinter.o fileopen.o\ - errormsg.o child.o vars.o plp_snprintf.o\ - - -########### DEPENDENCIES ######### -accounting.o accounting.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -child.o child.lo : config.h child.h debug.h errormsg.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -controlword.o controlword.lo : config.h control.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -copyright.o copyright.lo : config.h copyright.h debug.h errormsg.h license.h linelist.h lp.h patchlevel.h plp_snprintf.h portable.h utilities.h utilities.h -debug.o debug.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -errormsg.o errormsg.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -fileopen.o fileopen.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -gethostinfo.o gethostinfo.lo : config.h debug.h errormsg.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getprinter.o getprinter.lo : config.h child.h debug.h errormsg.h gethostinfo.h getprinter.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getqueue.o getqueue.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h merge.h permission.h plp_snprintf.h portable.h utilities.h utilities.h -globmatch.o globmatch.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -initialize.o initialize.lo : config.h defs.h child.h debug.h errorcodes.h errormsg.h gethostinfo.h getopt.h getqueue.h initialize.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -krb5_auth.o krb5_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h permission.h plp_snprintf.h portable.h utilities.h utilities.h -linelist.o linelist.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_dispatch.h lpd_jobs.h lpd_logger.h plp_snprintf.h portable.h utilities.h utilities.h -linksupport.o linksupport.lo : config.h debug.h errorcodes.h errormsg.h gethostinfo.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -lockfile.o lockfile.lo : config.h debug.h errormsg.h fileopen.h linelist.h lockfile.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -lpd_control.o lpd_control.lo : config.h child.h control.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_control.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_dispatch.o lpd_dispatch.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_control.h lpd_dispatch.h lpd_rcvjob.h lpd_remove.h lpd_secure.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_jobs.o lpd_jobs.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h merge.h permission.h plp_snprintf.h portable.h printjob.h proctitle.h sendjob.h sendmail.h stty.h utilities.h utilities.h -lpd_logger.o lpd_logger.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lp.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_rcvjob.o lpd_rcvjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -lpd_remove.o lpd_remove.lo : config.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h lp.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h -sendauth.o sendauth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h -lpd_secure.o lpd_secure.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_jobs.h lpd_rcvjob.h lpd_secure.h permission.h plp_snprintf.h portable.h proctitle.h user_auth.h utilities.h utilities.h -lpd_status.o lpd_status.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h lpd_jobs.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h -merge.o merge.lo : config.h debug.h errormsg.h linelist.h lp.h merge.h plp_snprintf.h portable.h utilities.h utilities.h -permission.o permission.lo : config.h debug.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h utilities.h utilities.h -plp_snprintf.o plp_snprintf.lo : config.h config.h -printjob.o printjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h -proctitle.o proctitle.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -sendjob.o sendjob.lo : config.h accounting.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h -sendmail.o sendmail.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h sendmail.h utilities.h utilities.h -sendreq.o sendreq.lo : config.h child.h debug.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h readstatus.h sendauth.h sendreq.h user_auth.h utilities.h utilities.h -ssl_auth.o ssl_auth.lo : config.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h lpd_secure.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h -stty.o stty.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h stty.h utilities.h utilities.h -user_auth.o user_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h md5.h permission.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h -utilities.o utilities.lo : config.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -vars.o vars.lo : config.h defs.h accounting.h child.h debug.h errormsg.h gethostinfo.h getqueue.h linelist.h lp.h permission.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h -md5.o md5.lo : md5.h md5.h -lpr.o lpr.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpd_jobs.h lpr.h patchlevel.h plp_snprintf.h portable.h printjob.h sendjob.h utilities.h utilities.h -lpq.o lpq.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpq.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h -lpc.o lpc.lo : config.h defs.h child.h control.h debug.h errorcodes.h errormsg.h getopt.h getprinter.h initialize.h linelist.h lp.h lpc.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h -lprm.o lprm.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lprm.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h -lpd.o lpd.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h -checkpc.o checkpc.lo : config.h defs.h checkpc.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd_remove.h patchlevel.h plp_snprintf.h portable.h proctitle.h stty.h utilities.h utilities.h -lpf.o lpf.lo : config.h portable.h portable.h -plp_snprintf.o plp_snprintf.lo : config.h config.h -monitor.o monitor.lo : config.h debug.h errormsg.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -lpbanner.o lpbanner.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h -plp_snprintf.o plp_snprintf.lo : config.h config.h +############################################################################### + +tar: distclean + rm -f */Makefile Makefile + chmod 755 `find . -name install-sh -print` + chmod 755 `find . -name mkinstalldirs -print` + chmod -R +w . + if [ -x /bin/pwd ] ; then DIR=`/bin/pwd`; fi ; \ + if [ -x /usr/bin/pwd ] ; then DIR=`/usr/bin/pwd`; fi ; \ + echo $${DIR}; \ + DIR=`echo $${DIR} | sed 's,.*/,,'`; \ + cd ..; \ + tar '--exclude=RCS' -zcf $${DIR}.tgz $${DIR}; \ + md5 $${DIR}.tgz | pgp -fast -u papowell@lprng > $${DIR}.tgz.md5 + @echo "" + +configure: configure.in + autoconf + autoheader + +dist: update ci distclean tar send +redist: ci distclean tar send + +send: + if [ -f ../SENDTO ] ; then (cd ..; sh SENDTO) ; fi diff --git a/trunk/user/LPRng/README b/trunk/user/LPRng/src/README similarity index 100% rename from trunk/user/LPRng/README rename to trunk/user/LPRng/src/README diff --git a/trunk/user/LPRng/README.SSL.SECURITY b/trunk/user/LPRng/src/README.SSL.SECURITY similarity index 100% rename from trunk/user/LPRng/README.SSL.SECURITY rename to trunk/user/LPRng/src/README.SSL.SECURITY diff --git a/trunk/user/LPRng/README.ports b/trunk/user/LPRng/src/README.ports similarity index 100% rename from trunk/user/LPRng/README.ports rename to trunk/user/LPRng/src/README.ports diff --git a/trunk/user/LPRng/STANDARD_configuration b/trunk/user/LPRng/src/STANDARD_configuration similarity index 100% rename from trunk/user/LPRng/STANDARD_configuration rename to trunk/user/LPRng/src/STANDARD_configuration diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/accnt b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/accnt similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/accnt rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/accnt diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA001taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA001taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA001taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA001taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA002taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA002taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA002taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA002taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA003taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA003taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA003taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA003taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA004taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA004taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA004taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA004taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA007taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA007taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA007taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA007taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA067taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA067taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA067taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA067taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA070taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA070taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA070taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA070taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA335taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA335taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA335taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA335taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA343taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA343taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA343taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA343taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA637taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA637taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA637taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA637taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA672taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA672taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA672taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA672taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA692taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA692taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/cfA692taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/cfA692taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA001taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA001taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA001taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA001taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA002taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA002taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA002taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA002taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA004taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA004taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA004taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA004taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA007taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA007taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA007taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA007taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA067taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA067taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA067taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA067taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA070taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA070taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA070taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA070taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA335taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA335taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA335taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA335taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA343taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA343taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA343taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA343taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA506taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA506taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA506taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA506taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA517taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA517taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA517taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA517taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA637taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA637taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA637taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA637taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA672taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA672taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA672taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA672taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA692taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA692taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/dfA692taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/dfA692taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/hfA335taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/hfA335taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/hfA335taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/hfA335taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/hfA637taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/hfA637taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/hfA637taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/hfA637taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/log b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/log similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/log rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/log diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/printcap b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/printcap similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/printcap rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/printcap diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t1/t1 b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/t1 similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t1/t1 rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t1/t1 diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t2/cfA335taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/cfA335taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t2/cfA335taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/cfA335taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t2/dfA335taco b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/dfA335taco similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t2/dfA335taco rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/dfA335taco diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t2/log b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/log similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t2/log rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/log diff --git a/trunk/user/LPRng/TESTSUPPORT/LPD/t2/t2 b/trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/t2 similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/LPD/t2/t2 rename to trunk/user/LPRng/src/TESTSUPPORT/LPD/t2/t2 diff --git a/trunk/user/LPRng/TESTSUPPORT/Makefile b/trunk/user/LPRng/src/TESTSUPPORT/Makefile similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/Makefile rename to trunk/user/LPRng/src/TESTSUPPORT/Makefile diff --git a/trunk/user/LPRng/TESTSUPPORT/Makefile.in b/trunk/user/LPRng/src/TESTSUPPORT/Makefile.in similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/Makefile.in rename to trunk/user/LPRng/src/TESTSUPPORT/Makefile.in diff --git a/trunk/user/LPRng/TESTSUPPORT/README b/trunk/user/LPRng/src/TESTSUPPORT/README similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/README rename to trunk/user/LPRng/src/TESTSUPPORT/README diff --git a/trunk/user/LPRng/TESTSUPPORT/bqfilter.sh b/trunk/user/LPRng/src/TESTSUPPORT/bqfilter.sh similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/bqfilter.sh rename to trunk/user/LPRng/src/TESTSUPPORT/bqfilter.sh diff --git a/trunk/user/LPRng/TESTSUPPORT/clearlog b/trunk/user/LPRng/src/TESTSUPPORT/clearlog similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/clearlog rename to trunk/user/LPRng/src/TESTSUPPORT/clearlog diff --git a/trunk/user/LPRng/TESTSUPPORT/common.conf.proto b/trunk/user/LPRng/src/TESTSUPPORT/common.conf.proto similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/common.conf.proto rename to trunk/user/LPRng/src/TESTSUPPORT/common.conf.proto diff --git a/trunk/user/LPRng/TESTSUPPORT/control_filter b/trunk/user/LPRng/src/TESTSUPPORT/control_filter similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/control_filter rename to trunk/user/LPRng/src/TESTSUPPORT/control_filter diff --git a/trunk/user/LPRng/TESTSUPPORT/dbserver.sh b/trunk/user/LPRng/src/TESTSUPPORT/dbserver.sh similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/dbserver.sh rename to trunk/user/LPRng/src/TESTSUPPORT/dbserver.sh diff --git a/trunk/user/LPRng/TESTSUPPORT/filter b/trunk/user/LPRng/src/TESTSUPPORT/filter similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/filter rename to trunk/user/LPRng/src/TESTSUPPORT/filter diff --git a/trunk/user/LPRng/TESTSUPPORT/filter.sh b/trunk/user/LPRng/src/TESTSUPPORT/filter.sh similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/filter.sh rename to trunk/user/LPRng/src/TESTSUPPORT/filter.sh diff --git a/trunk/user/LPRng/TESTSUPPORT/lpd.conf.proto b/trunk/user/LPRng/src/TESTSUPPORT/lpd.conf.proto similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/lpd.conf.proto rename to trunk/user/LPRng/src/TESTSUPPORT/lpd.conf.proto diff --git a/trunk/user/LPRng/TESTSUPPORT/lpd.perms.proto b/trunk/user/LPRng/src/TESTSUPPORT/lpd.perms.proto similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/lpd.perms.proto rename to trunk/user/LPRng/src/TESTSUPPORT/lpd.perms.proto diff --git a/trunk/user/LPRng/TESTSUPPORT/lpd_printcap.proto b/trunk/user/LPRng/src/TESTSUPPORT/lpd_printcap.proto similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/lpd_printcap.proto rename to trunk/user/LPRng/src/TESTSUPPORT/lpd_printcap.proto diff --git a/trunk/user/LPRng/TESTSUPPORT/makedb b/trunk/user/LPRng/src/TESTSUPPORT/makedb similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/makedb rename to trunk/user/LPRng/src/TESTSUPPORT/makedb diff --git a/trunk/user/LPRng/TESTSUPPORT/mkinstalldirs b/trunk/user/LPRng/src/TESTSUPPORT/mkinstalldirs similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/mkinstalldirs rename to trunk/user/LPRng/src/TESTSUPPORT/mkinstalldirs diff --git a/trunk/user/LPRng/TESTSUPPORT/printcap.proto b/trunk/user/LPRng/src/TESTSUPPORT/printcap.proto similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/printcap.proto rename to trunk/user/LPRng/src/TESTSUPPORT/printcap.proto diff --git a/trunk/user/LPRng/TESTSUPPORT/router.sh b/trunk/user/LPRng/src/TESTSUPPORT/router.sh similarity index 100% rename from trunk/user/LPRng/TESTSUPPORT/router.sh rename to trunk/user/LPRng/src/TESTSUPPORT/router.sh diff --git a/trunk/user/LPRng/TODO b/trunk/user/LPRng/src/TODO similarity index 100% rename from trunk/user/LPRng/TODO rename to trunk/user/LPRng/src/TODO diff --git a/trunk/user/LPRng/TopLevelMakefile b/trunk/user/LPRng/src/TopLevelMakefile similarity index 100% rename from trunk/user/LPRng/TopLevelMakefile rename to trunk/user/LPRng/src/TopLevelMakefile diff --git a/trunk/user/LPRng/UPDATE b/trunk/user/LPRng/src/UPDATE similarity index 100% rename from trunk/user/LPRng/UPDATE rename to trunk/user/LPRng/src/UPDATE diff --git a/trunk/user/LPRng/UTILS/CIFAST b/trunk/user/LPRng/src/UTILS/CIFAST similarity index 100% rename from trunk/user/LPRng/UTILS/CIFAST rename to trunk/user/LPRng/src/UTILS/CIFAST diff --git a/trunk/user/LPRng/UTILS/LPRng.pm b/trunk/user/LPRng/src/UTILS/LPRng.pm similarity index 100% rename from trunk/user/LPRng/UTILS/LPRng.pm rename to trunk/user/LPRng/src/UTILS/LPRng.pm diff --git a/trunk/user/LPRng/UTILS/LPRng.pm.in b/trunk/user/LPRng/src/UTILS/LPRng.pm.in similarity index 100% rename from trunk/user/LPRng/UTILS/LPRng.pm.in rename to trunk/user/LPRng/src/UTILS/LPRng.pm.in diff --git a/trunk/user/LPRng/UTILS/Makefile b/trunk/user/LPRng/src/UTILS/Makefile similarity index 100% rename from trunk/user/LPRng/UTILS/Makefile rename to trunk/user/LPRng/src/UTILS/Makefile diff --git a/trunk/user/LPRng/UTILS/Makefile.in b/trunk/user/LPRng/src/UTILS/Makefile.in similarity index 100% rename from trunk/user/LPRng/UTILS/Makefile.in rename to trunk/user/LPRng/src/UTILS/Makefile.in diff --git a/trunk/user/LPRng/UTILS/README b/trunk/user/LPRng/src/UTILS/README similarity index 100% rename from trunk/user/LPRng/UTILS/README rename to trunk/user/LPRng/src/UTILS/README diff --git a/trunk/user/LPRng/UTILS/README.ForKerberosHackers b/trunk/user/LPRng/src/UTILS/README.ForKerberosHackers similarity index 100% rename from trunk/user/LPRng/UTILS/README.ForKerberosHackers rename to trunk/user/LPRng/src/UTILS/README.ForKerberosHackers diff --git a/trunk/user/LPRng/UTILS/accounting.pl b/trunk/user/LPRng/src/UTILS/accounting.pl similarity index 100% rename from trunk/user/LPRng/UTILS/accounting.pl rename to trunk/user/LPRng/src/UTILS/accounting.pl diff --git a/trunk/user/LPRng/UTILS/accounting.pl.in b/trunk/user/LPRng/src/UTILS/accounting.pl.in similarity index 100% rename from trunk/user/LPRng/UTILS/accounting.pl.in rename to trunk/user/LPRng/src/UTILS/accounting.pl.in diff --git a/trunk/user/LPRng/UTILS/atalkprint b/trunk/user/LPRng/src/UTILS/atalkprint similarity index 100% rename from trunk/user/LPRng/UTILS/atalkprint rename to trunk/user/LPRng/src/UTILS/atalkprint diff --git a/trunk/user/LPRng/UTILS/chooser.in b/trunk/user/LPRng/src/UTILS/chooser.in similarity index 100% rename from trunk/user/LPRng/UTILS/chooser.in rename to trunk/user/LPRng/src/UTILS/chooser.in diff --git a/trunk/user/LPRng/UTILS/decode_args_with_perl b/trunk/user/LPRng/src/UTILS/decode_args_with_perl similarity index 100% rename from trunk/user/LPRng/UTILS/decode_args_with_perl rename to trunk/user/LPRng/src/UTILS/decode_args_with_perl diff --git a/trunk/user/LPRng/UTILS/decode_args_with_perl.in b/trunk/user/LPRng/src/UTILS/decode_args_with_perl.in similarity index 100% rename from trunk/user/LPRng/UTILS/decode_args_with_perl.in rename to trunk/user/LPRng/src/UTILS/decode_args_with_perl.in diff --git a/trunk/user/LPRng/UTILS/decode_args_with_sh b/trunk/user/LPRng/src/UTILS/decode_args_with_sh similarity index 100% rename from trunk/user/LPRng/UTILS/decode_args_with_sh rename to trunk/user/LPRng/src/UTILS/decode_args_with_sh diff --git a/trunk/user/LPRng/UTILS/decode_args_with_sh.in b/trunk/user/LPRng/src/UTILS/decode_args_with_sh.in similarity index 100% rename from trunk/user/LPRng/UTILS/decode_args_with_sh.in rename to trunk/user/LPRng/src/UTILS/decode_args_with_sh.in diff --git a/trunk/user/LPRng/UTILS/fixid b/trunk/user/LPRng/src/UTILS/fixid similarity index 100% rename from trunk/user/LPRng/UTILS/fixid rename to trunk/user/LPRng/src/UTILS/fixid diff --git a/trunk/user/LPRng/UTILS/fixid.in b/trunk/user/LPRng/src/UTILS/fixid.in similarity index 100% rename from trunk/user/LPRng/UTILS/fixid.in rename to trunk/user/LPRng/src/UTILS/fixid.in diff --git a/trunk/user/LPRng/UTILS/fixupdate b/trunk/user/LPRng/src/UTILS/fixupdate similarity index 100% rename from trunk/user/LPRng/UTILS/fixupdate rename to trunk/user/LPRng/src/UTILS/fixupdate diff --git a/trunk/user/LPRng/UTILS/fixupdate.in b/trunk/user/LPRng/src/UTILS/fixupdate.in similarity index 100% rename from trunk/user/LPRng/UTILS/fixupdate.in rename to trunk/user/LPRng/src/UTILS/fixupdate.in diff --git a/trunk/user/LPRng/UTILS/freefs.c b/trunk/user/LPRng/src/UTILS/freefs.c similarity index 100% rename from trunk/user/LPRng/UTILS/freefs.c rename to trunk/user/LPRng/src/UTILS/freefs.c diff --git a/trunk/user/LPRng/UTILS/hello.ps b/trunk/user/LPRng/src/UTILS/hello.ps similarity index 100% rename from trunk/user/LPRng/UTILS/hello.ps rename to trunk/user/LPRng/src/UTILS/hello.ps diff --git a/trunk/user/LPRng/UTILS/linetest.c b/trunk/user/LPRng/src/UTILS/linetest.c similarity index 100% rename from trunk/user/LPRng/UTILS/linetest.c rename to trunk/user/LPRng/src/UTILS/linetest.c diff --git a/trunk/user/LPRng/UTILS/lpq_in_perl b/trunk/user/LPRng/src/UTILS/lpq_in_perl similarity index 100% rename from trunk/user/LPRng/UTILS/lpq_in_perl rename to trunk/user/LPRng/src/UTILS/lpq_in_perl diff --git a/trunk/user/LPRng/UTILS/lpq_in_perl.in b/trunk/user/LPRng/src/UTILS/lpq_in_perl.in similarity index 100% rename from trunk/user/LPRng/UTILS/lpq_in_perl.in rename to trunk/user/LPRng/src/UTILS/lpq_in_perl.in diff --git a/trunk/user/LPRng/UTILS/lpr_in_perl b/trunk/user/LPRng/src/UTILS/lpr_in_perl similarity index 100% rename from trunk/user/LPRng/UTILS/lpr_in_perl rename to trunk/user/LPRng/src/UTILS/lpr_in_perl diff --git a/trunk/user/LPRng/UTILS/lpr_in_perl.in b/trunk/user/LPRng/src/UTILS/lpr_in_perl.in similarity index 100% rename from trunk/user/LPRng/UTILS/lpr_in_perl.in rename to trunk/user/LPRng/src/UTILS/lpr_in_perl.in diff --git a/trunk/user/LPRng/UTILS/lprm_in_perl b/trunk/user/LPRng/src/UTILS/lprm_in_perl similarity index 100% rename from trunk/user/LPRng/UTILS/lprm_in_perl rename to trunk/user/LPRng/src/UTILS/lprm_in_perl diff --git a/trunk/user/LPRng/UTILS/lprm_in_perl.in b/trunk/user/LPRng/src/UTILS/lprm_in_perl.in similarity index 100% rename from trunk/user/LPRng/UTILS/lprm_in_perl.in rename to trunk/user/LPRng/src/UTILS/lprm_in_perl.in diff --git a/trunk/user/LPRng/UTILS/make_lpd_conf b/trunk/user/LPRng/src/UTILS/make_lpd_conf similarity index 100% rename from trunk/user/LPRng/UTILS/make_lpd_conf rename to trunk/user/LPRng/src/UTILS/make_lpd_conf diff --git a/trunk/user/LPRng/UTILS/make_lpd_conf.in b/trunk/user/LPRng/src/UTILS/make_lpd_conf.in similarity index 100% rename from trunk/user/LPRng/UTILS/make_lpd_conf.in rename to trunk/user/LPRng/src/UTILS/make_lpd_conf.in diff --git a/trunk/user/LPRng/UTILS/make_printcap_use b/trunk/user/LPRng/src/UTILS/make_printcap_use similarity index 100% rename from trunk/user/LPRng/UTILS/make_printcap_use rename to trunk/user/LPRng/src/UTILS/make_printcap_use diff --git a/trunk/user/LPRng/UTILS/make_printcap_use.in b/trunk/user/LPRng/src/UTILS/make_printcap_use.in similarity index 100% rename from trunk/user/LPRng/UTILS/make_printcap_use.in rename to trunk/user/LPRng/src/UTILS/make_printcap_use.in diff --git a/trunk/user/LPRng/UTILS/makeinc b/trunk/user/LPRng/src/UTILS/makeinc similarity index 100% rename from trunk/user/LPRng/UTILS/makeinc rename to trunk/user/LPRng/src/UTILS/makeinc diff --git a/trunk/user/LPRng/UTILS/makeinc.in b/trunk/user/LPRng/src/UTILS/makeinc.in similarity index 100% rename from trunk/user/LPRng/UTILS/makeinc.in rename to trunk/user/LPRng/src/UTILS/makeinc.in diff --git a/trunk/user/LPRng/UTILS/ncpprint b/trunk/user/LPRng/src/UTILS/ncpprint similarity index 100% rename from trunk/user/LPRng/UTILS/ncpprint rename to trunk/user/LPRng/src/UTILS/ncpprint diff --git a/trunk/user/LPRng/UTILS/one.pcl b/trunk/user/LPRng/src/UTILS/one.pcl similarity index 100% rename from trunk/user/LPRng/UTILS/one.pcl rename to trunk/user/LPRng/src/UTILS/one.pcl diff --git a/trunk/user/LPRng/UTILS/one.pjl b/trunk/user/LPRng/src/UTILS/one.pjl similarity index 100% rename from trunk/user/LPRng/UTILS/one.pjl rename to trunk/user/LPRng/src/UTILS/one.pjl diff --git a/trunk/user/LPRng/UTILS/one.ps b/trunk/user/LPRng/src/UTILS/one.ps similarity index 100% rename from trunk/user/LPRng/UTILS/one.ps rename to trunk/user/LPRng/src/UTILS/one.ps diff --git a/trunk/user/LPRng/UTILS/read_conf b/trunk/user/LPRng/src/UTILS/read_conf similarity index 100% rename from trunk/user/LPRng/UTILS/read_conf rename to trunk/user/LPRng/src/UTILS/read_conf diff --git a/trunk/user/LPRng/UTILS/read_conf.in b/trunk/user/LPRng/src/UTILS/read_conf.in similarity index 100% rename from trunk/user/LPRng/UTILS/read_conf.in rename to trunk/user/LPRng/src/UTILS/read_conf.in diff --git a/trunk/user/LPRng/UTILS/remote_active b/trunk/user/LPRng/src/UTILS/remote_active similarity index 100% rename from trunk/user/LPRng/UTILS/remote_active rename to trunk/user/LPRng/src/UTILS/remote_active diff --git a/trunk/user/LPRng/UTILS/remote_active.in b/trunk/user/LPRng/src/UTILS/remote_active.in similarity index 100% rename from trunk/user/LPRng/UTILS/remote_active.in rename to trunk/user/LPRng/src/UTILS/remote_active.in diff --git a/trunk/user/LPRng/UTILS/set_file_time b/trunk/user/LPRng/src/UTILS/set_file_time similarity index 100% rename from trunk/user/LPRng/UTILS/set_file_time rename to trunk/user/LPRng/src/UTILS/set_file_time diff --git a/trunk/user/LPRng/UTILS/set_file_time.c b/trunk/user/LPRng/src/UTILS/set_file_time.c similarity index 100% rename from trunk/user/LPRng/UTILS/set_file_time.c rename to trunk/user/LPRng/src/UTILS/set_file_time.c diff --git a/trunk/user/LPRng/UTILS/smbprint b/trunk/user/LPRng/src/UTILS/smbprint similarity index 100% rename from trunk/user/LPRng/UTILS/smbprint rename to trunk/user/LPRng/src/UTILS/smbprint diff --git a/trunk/user/LPRng/UTILS/tcpsend.c b/trunk/user/LPRng/src/UTILS/tcpsend.c similarity index 100% rename from trunk/user/LPRng/UTILS/tcpsend.c rename to trunk/user/LPRng/src/UTILS/tcpsend.c diff --git a/trunk/user/LPRng/UTILS/termcap.c b/trunk/user/LPRng/src/UTILS/termcap.c similarity index 100% rename from trunk/user/LPRng/UTILS/termcap.c rename to trunk/user/LPRng/src/UTILS/termcap.c diff --git a/trunk/user/LPRng/UTILS/test_read b/trunk/user/LPRng/src/UTILS/test_read similarity index 100% rename from trunk/user/LPRng/UTILS/test_read rename to trunk/user/LPRng/src/UTILS/test_read diff --git a/trunk/user/LPRng/UTILS/test_read.in b/trunk/user/LPRng/src/UTILS/test_read.in similarity index 100% rename from trunk/user/LPRng/UTILS/test_read.in rename to trunk/user/LPRng/src/UTILS/test_read.in diff --git a/trunk/user/LPRng/UTILS/test_rw_pipe.c b/trunk/user/LPRng/src/UTILS/test_rw_pipe.c similarity index 100% rename from trunk/user/LPRng/UTILS/test_rw_pipe.c rename to trunk/user/LPRng/src/UTILS/test_rw_pipe.c diff --git a/trunk/user/LPRng/UTILS/testpr b/trunk/user/LPRng/src/UTILS/testpr similarity index 100% rename from trunk/user/LPRng/UTILS/testpr rename to trunk/user/LPRng/src/UTILS/testpr diff --git a/trunk/user/LPRng/UTILS/update_z.pl b/trunk/user/LPRng/src/UTILS/update_z.pl similarity index 100% rename from trunk/user/LPRng/UTILS/update_z.pl rename to trunk/user/LPRng/src/UTILS/update_z.pl diff --git a/trunk/user/LPRng/UTILS/update_z.pl.in b/trunk/user/LPRng/src/UTILS/update_z.pl.in similarity index 100% rename from trunk/user/LPRng/UTILS/update_z.pl.in rename to trunk/user/LPRng/src/UTILS/update_z.pl.in diff --git a/trunk/user/LPRng/UTILS/xlate.c b/trunk/user/LPRng/src/UTILS/xlate.c similarity index 100% rename from trunk/user/LPRng/UTILS/xlate.c rename to trunk/user/LPRng/src/UTILS/xlate.c diff --git a/trunk/user/LPRng/VERSION b/trunk/user/LPRng/src/VERSION similarity index 100% rename from trunk/user/LPRng/VERSION rename to trunk/user/LPRng/src/VERSION diff --git a/trunk/user/LPRng/Y2KCompliance b/trunk/user/LPRng/src/Y2KCompliance similarity index 100% rename from trunk/user/LPRng/Y2KCompliance rename to trunk/user/LPRng/src/Y2KCompliance diff --git a/trunk/user/LPRng/acinclude.m4 b/trunk/user/LPRng/src/acinclude.m4 similarity index 100% rename from trunk/user/LPRng/acinclude.m4 rename to trunk/user/LPRng/src/acinclude.m4 diff --git a/trunk/user/LPRng/aclocal.m4 b/trunk/user/LPRng/src/aclocal.m4 similarity index 100% rename from trunk/user/LPRng/aclocal.m4 rename to trunk/user/LPRng/src/aclocal.m4 diff --git a/trunk/user/LPRng/asus_README b/trunk/user/LPRng/src/asus_README similarity index 100% rename from trunk/user/LPRng/asus_README rename to trunk/user/LPRng/src/asus_README diff --git a/trunk/user/LPRng/config.guess b/trunk/user/LPRng/src/config.guess similarity index 100% rename from trunk/user/LPRng/config.guess rename to trunk/user/LPRng/src/config.guess diff --git a/trunk/user/LPRng/config.h b/trunk/user/LPRng/src/config.h similarity index 100% rename from trunk/user/LPRng/config.h rename to trunk/user/LPRng/src/config.h diff --git a/trunk/user/LPRng/config.h.in b/trunk/user/LPRng/src/config.h.in similarity index 100% rename from trunk/user/LPRng/config.h.in rename to trunk/user/LPRng/src/config.h.in diff --git a/trunk/user/LPRng/config.rpath b/trunk/user/LPRng/src/config.rpath similarity index 100% rename from trunk/user/LPRng/config.rpath rename to trunk/user/LPRng/src/config.rpath diff --git a/trunk/user/LPRng/config.sub b/trunk/user/LPRng/src/config.sub similarity index 100% rename from trunk/user/LPRng/config.sub rename to trunk/user/LPRng/src/config.sub diff --git a/trunk/user/LPRng/configure b/trunk/user/LPRng/src/configure similarity index 100% rename from trunk/user/LPRng/configure rename to trunk/user/LPRng/src/configure diff --git a/trunk/user/LPRng/configure.in b/trunk/user/LPRng/src/configure.in similarity index 100% rename from trunk/user/LPRng/configure.in rename to trunk/user/LPRng/src/configure.in diff --git a/trunk/user/LPRng/hfA018 b/trunk/user/LPRng/src/hfA018 similarity index 100% rename from trunk/user/LPRng/hfA018 rename to trunk/user/LPRng/src/hfA018 diff --git a/trunk/user/LPRng/init.freebsd.sh b/trunk/user/LPRng/src/init.freebsd.sh similarity index 100% rename from trunk/user/LPRng/init.freebsd.sh rename to trunk/user/LPRng/src/init.freebsd.sh diff --git a/trunk/user/LPRng/init.linux.sh b/trunk/user/LPRng/src/init.linux.sh similarity index 100% rename from trunk/user/LPRng/init.linux.sh rename to trunk/user/LPRng/src/init.linux.sh diff --git a/trunk/user/LPRng/init.linuxsb.sh b/trunk/user/LPRng/src/init.linuxsb.sh similarity index 100% rename from trunk/user/LPRng/init.linuxsb.sh rename to trunk/user/LPRng/src/init.linuxsb.sh diff --git a/trunk/user/LPRng/init.redhat.sh b/trunk/user/LPRng/src/init.redhat.sh similarity index 100% rename from trunk/user/LPRng/init.redhat.sh rename to trunk/user/LPRng/src/init.redhat.sh diff --git a/trunk/user/LPRng/init.solaris.sh b/trunk/user/LPRng/src/init.solaris.sh similarity index 100% rename from trunk/user/LPRng/init.solaris.sh rename to trunk/user/LPRng/src/init.solaris.sh diff --git a/trunk/user/LPRng/libtool b/trunk/user/LPRng/src/libtool similarity index 100% rename from trunk/user/LPRng/libtool rename to trunk/user/LPRng/src/libtool diff --git a/trunk/user/LPRng/lpd.perms b/trunk/user/LPRng/src/lpd.perms similarity index 100% rename from trunk/user/LPRng/lpd.perms rename to trunk/user/LPRng/src/lpd.perms diff --git a/trunk/user/LPRng/lpd.perms.in b/trunk/user/LPRng/src/lpd.perms.in similarity index 100% rename from trunk/user/LPRng/lpd.perms.in rename to trunk/user/LPRng/src/lpd.perms.in diff --git a/trunk/user/LPRng/lpd_STATFS b/trunk/user/LPRng/src/lpd_STATFS similarity index 100% rename from trunk/user/LPRng/lpd_STATFS rename to trunk/user/LPRng/src/lpd_STATFS diff --git a/trunk/user/LPRng/ltconfig b/trunk/user/LPRng/src/ltconfig similarity index 100% rename from trunk/user/LPRng/ltconfig rename to trunk/user/LPRng/src/ltconfig diff --git a/trunk/user/LPRng/ltmain.sh b/trunk/user/LPRng/src/ltmain.sh similarity index 100% rename from trunk/user/LPRng/ltmain.sh rename to trunk/user/LPRng/src/ltmain.sh diff --git a/trunk/user/LPRng/man/Makefile b/trunk/user/LPRng/src/man/Makefile similarity index 100% rename from trunk/user/LPRng/man/Makefile rename to trunk/user/LPRng/src/man/Makefile diff --git a/trunk/user/LPRng/man/Makefile.in b/trunk/user/LPRng/src/man/Makefile.in similarity index 100% rename from trunk/user/LPRng/man/Makefile.in rename to trunk/user/LPRng/src/man/Makefile.in diff --git a/trunk/user/LPRng/man/README b/trunk/user/LPRng/src/man/README similarity index 100% rename from trunk/user/LPRng/man/README rename to trunk/user/LPRng/src/man/README diff --git a/trunk/user/LPRng/man/cancel.n b/trunk/user/LPRng/src/man/cancel.n similarity index 100% rename from trunk/user/LPRng/man/cancel.n rename to trunk/user/LPRng/src/man/cancel.n diff --git a/trunk/user/LPRng/man/checkpc.n b/trunk/user/LPRng/src/man/checkpc.n similarity index 100% rename from trunk/user/LPRng/man/checkpc.n rename to trunk/user/LPRng/src/man/checkpc.n diff --git a/trunk/user/LPRng/install-sh b/trunk/user/LPRng/src/man/install-sh similarity index 100% rename from trunk/user/LPRng/install-sh rename to trunk/user/LPRng/src/man/install-sh diff --git a/trunk/user/LPRng/man/lp.n b/trunk/user/LPRng/src/man/lp.n similarity index 100% rename from trunk/user/LPRng/man/lp.n rename to trunk/user/LPRng/src/man/lp.n diff --git a/trunk/user/LPRng/man/lpbanner.n b/trunk/user/LPRng/src/man/lpbanner.n similarity index 100% rename from trunk/user/LPRng/man/lpbanner.n rename to trunk/user/LPRng/src/man/lpbanner.n diff --git a/trunk/user/LPRng/man/lpc.n b/trunk/user/LPRng/src/man/lpc.n similarity index 100% rename from trunk/user/LPRng/man/lpc.n rename to trunk/user/LPRng/src/man/lpc.n diff --git a/trunk/user/LPRng/man/lpd.conf.n b/trunk/user/LPRng/src/man/lpd.conf.n similarity index 100% rename from trunk/user/LPRng/man/lpd.conf.n rename to trunk/user/LPRng/src/man/lpd.conf.n diff --git a/trunk/user/LPRng/man/lpd.n b/trunk/user/LPRng/src/man/lpd.n similarity index 100% rename from trunk/user/LPRng/man/lpd.n rename to trunk/user/LPRng/src/man/lpd.n diff --git a/trunk/user/LPRng/man/lpd.perms.n b/trunk/user/LPRng/src/man/lpd.perms.n similarity index 100% rename from trunk/user/LPRng/man/lpd.perms.n rename to trunk/user/LPRng/src/man/lpd.perms.n diff --git a/trunk/user/LPRng/man/lpf.n b/trunk/user/LPRng/src/man/lpf.n similarity index 100% rename from trunk/user/LPRng/man/lpf.n rename to trunk/user/LPRng/src/man/lpf.n diff --git a/trunk/user/LPRng/man/lpq.n b/trunk/user/LPRng/src/man/lpq.n similarity index 100% rename from trunk/user/LPRng/man/lpq.n rename to trunk/user/LPRng/src/man/lpq.n diff --git a/trunk/user/LPRng/man/lpr.n b/trunk/user/LPRng/src/man/lpr.n similarity index 100% rename from trunk/user/LPRng/man/lpr.n rename to trunk/user/LPRng/src/man/lpr.n diff --git a/trunk/user/LPRng/man/lprm.n b/trunk/user/LPRng/src/man/lprm.n similarity index 100% rename from trunk/user/LPRng/man/lprm.n rename to trunk/user/LPRng/src/man/lprm.n diff --git a/trunk/user/LPRng/man/lprng_certs.n b/trunk/user/LPRng/src/man/lprng_certs.n similarity index 100% rename from trunk/user/LPRng/man/lprng_certs.n rename to trunk/user/LPRng/src/man/lprng_certs.n diff --git a/trunk/user/LPRng/man/lprng_index_certs.n b/trunk/user/LPRng/src/man/lprng_index_certs.n similarity index 100% rename from trunk/user/LPRng/man/lprng_index_certs.n rename to trunk/user/LPRng/src/man/lprng_index_certs.n diff --git a/trunk/user/LPRng/man/lpstat.n b/trunk/user/LPRng/src/man/lpstat.n similarity index 100% rename from trunk/user/LPRng/man/lpstat.n rename to trunk/user/LPRng/src/man/lpstat.n diff --git a/trunk/user/LPRng/man/mkinstalldirs b/trunk/user/LPRng/src/man/mkinstalldirs similarity index 100% rename from trunk/user/LPRng/man/mkinstalldirs rename to trunk/user/LPRng/src/man/mkinstalldirs diff --git a/trunk/user/LPRng/man/monitor.n b/trunk/user/LPRng/src/man/monitor.n similarity index 100% rename from trunk/user/LPRng/man/monitor.n rename to trunk/user/LPRng/src/man/monitor.n diff --git a/trunk/user/LPRng/man/pclbanner.n b/trunk/user/LPRng/src/man/pclbanner.n similarity index 100% rename from trunk/user/LPRng/man/pclbanner.n rename to trunk/user/LPRng/src/man/pclbanner.n diff --git a/trunk/user/LPRng/man/printcap.n b/trunk/user/LPRng/src/man/printcap.n similarity index 100% rename from trunk/user/LPRng/man/printcap.n rename to trunk/user/LPRng/src/man/printcap.n diff --git a/trunk/user/LPRng/man/psbanner.n b/trunk/user/LPRng/src/man/psbanner.n similarity index 100% rename from trunk/user/LPRng/man/psbanner.n rename to trunk/user/LPRng/src/man/psbanner.n diff --git a/trunk/user/LPRng/src/mkinstalldirs b/trunk/user/LPRng/src/mkinstalldirs index b75fa333dc6..23a638c9f63 100644 --- a/trunk/user/LPRng/src/mkinstalldirs +++ b/trunk/user/LPRng/src/mkinstalldirs @@ -4,29 +4,9 @@ # Created: 1993-05-16 # Public domain -# mkinstalldirs,v 1.1 2001/08/21 20:33:17 root Exp +# $Id: mkinstalldirs,v 1.1.1.1 2008/10/15 03:28:09 james26_jang Exp $ errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case "${1}" in - -h | --help | --h* ) # -h for help - echo "${usage}" 1>&2; exit 0 ;; - -m ) # -m PERM arg - shift - test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } - dirmode="${1}" - shift ;; - -- ) shift; break ;; # stop option processing - -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option - * ) break ;; # first non-opt arg - esac -done for file do @@ -48,17 +28,6 @@ do if test ! -d "$pathcomp"; then errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod $dirmode "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi fi fi @@ -68,7 +37,4 @@ done exit $errstatus -# Local Variables: -# mode:shell-script -# sh-indentation:3 -# End: +# mkinstalldirs ends here diff --git a/trunk/user/LPRng/po/ChangeLog b/trunk/user/LPRng/src/po/ChangeLog similarity index 100% rename from trunk/user/LPRng/po/ChangeLog rename to trunk/user/LPRng/src/po/ChangeLog diff --git a/trunk/user/LPRng/po/LPRng.pot b/trunk/user/LPRng/src/po/LPRng.pot similarity index 100% rename from trunk/user/LPRng/po/LPRng.pot rename to trunk/user/LPRng/src/po/LPRng.pot diff --git a/trunk/user/LPRng/po/Makefile b/trunk/user/LPRng/src/po/Makefile similarity index 100% rename from trunk/user/LPRng/po/Makefile rename to trunk/user/LPRng/src/po/Makefile diff --git a/trunk/user/LPRng/po/Makefile.in b/trunk/user/LPRng/src/po/Makefile.in similarity index 100% rename from trunk/user/LPRng/po/Makefile.in rename to trunk/user/LPRng/src/po/Makefile.in diff --git a/trunk/user/LPRng/po/Makefile.in.in b/trunk/user/LPRng/src/po/Makefile.in.in similarity index 100% rename from trunk/user/LPRng/po/Makefile.in.in rename to trunk/user/LPRng/src/po/Makefile.in.in diff --git a/trunk/user/LPRng/po/Makevars b/trunk/user/LPRng/src/po/Makevars similarity index 100% rename from trunk/user/LPRng/po/Makevars rename to trunk/user/LPRng/src/po/Makevars diff --git a/trunk/user/LPRng/po/POTFILES b/trunk/user/LPRng/src/po/POTFILES similarity index 100% rename from trunk/user/LPRng/po/POTFILES rename to trunk/user/LPRng/src/po/POTFILES diff --git a/trunk/user/LPRng/po/POTFILES.in b/trunk/user/LPRng/src/po/POTFILES.in similarity index 100% rename from trunk/user/LPRng/po/POTFILES.in rename to trunk/user/LPRng/src/po/POTFILES.in diff --git a/trunk/user/LPRng/po/Rules-quot b/trunk/user/LPRng/src/po/Rules-quot similarity index 100% rename from trunk/user/LPRng/po/Rules-quot rename to trunk/user/LPRng/src/po/Rules-quot diff --git a/trunk/user/LPRng/po/boldquot.sed b/trunk/user/LPRng/src/po/boldquot.sed similarity index 100% rename from trunk/user/LPRng/po/boldquot.sed rename to trunk/user/LPRng/src/po/boldquot.sed diff --git a/trunk/user/LPRng/po/en@boldquot.header b/trunk/user/LPRng/src/po/en@boldquot.header similarity index 100% rename from trunk/user/LPRng/po/en@boldquot.header rename to trunk/user/LPRng/src/po/en@boldquot.header diff --git a/trunk/user/LPRng/po/en@quot.header b/trunk/user/LPRng/src/po/en@quot.header similarity index 100% rename from trunk/user/LPRng/po/en@quot.header rename to trunk/user/LPRng/src/po/en@quot.header diff --git a/trunk/user/LPRng/po/fr.gmo b/trunk/user/LPRng/src/po/fr.gmo similarity index 100% rename from trunk/user/LPRng/po/fr.gmo rename to trunk/user/LPRng/src/po/fr.gmo diff --git a/trunk/user/LPRng/po/fr.po b/trunk/user/LPRng/src/po/fr.po similarity index 100% rename from trunk/user/LPRng/po/fr.po rename to trunk/user/LPRng/src/po/fr.po diff --git a/trunk/user/LPRng/po/insert-header.sin b/trunk/user/LPRng/src/po/insert-header.sin similarity index 100% rename from trunk/user/LPRng/po/insert-header.sin rename to trunk/user/LPRng/src/po/insert-header.sin diff --git a/trunk/user/LPRng/po/quot.sed b/trunk/user/LPRng/src/po/quot.sed similarity index 100% rename from trunk/user/LPRng/po/quot.sed rename to trunk/user/LPRng/src/po/quot.sed diff --git a/trunk/user/LPRng/po/remove-potcdate.sed b/trunk/user/LPRng/src/po/remove-potcdate.sed similarity index 100% rename from trunk/user/LPRng/po/remove-potcdate.sed rename to trunk/user/LPRng/src/po/remove-potcdate.sed diff --git a/trunk/user/LPRng/po/remove-potcdate.sin b/trunk/user/LPRng/src/po/remove-potcdate.sin similarity index 100% rename from trunk/user/LPRng/po/remove-potcdate.sin rename to trunk/user/LPRng/src/po/remove-potcdate.sin diff --git a/trunk/user/LPRng/postinstall.freebsd.sh b/trunk/user/LPRng/src/postinstall.freebsd.sh similarity index 100% rename from trunk/user/LPRng/postinstall.freebsd.sh rename to trunk/user/LPRng/src/postinstall.freebsd.sh diff --git a/trunk/user/LPRng/postinstall.generic.sh b/trunk/user/LPRng/src/postinstall.generic.sh similarity index 100% rename from trunk/user/LPRng/postinstall.generic.sh rename to trunk/user/LPRng/src/postinstall.generic.sh diff --git a/trunk/user/LPRng/postinstall.linux.sh b/trunk/user/LPRng/src/postinstall.linux.sh similarity index 100% rename from trunk/user/LPRng/postinstall.linux.sh rename to trunk/user/LPRng/src/postinstall.linux.sh diff --git a/trunk/user/LPRng/postinstall.solaris.sh b/trunk/user/LPRng/src/postinstall.solaris.sh similarity index 100% rename from trunk/user/LPRng/postinstall.solaris.sh rename to trunk/user/LPRng/src/postinstall.solaris.sh diff --git a/trunk/user/LPRng/postremove.generic.sh b/trunk/user/LPRng/src/postremove.generic.sh similarity index 100% rename from trunk/user/LPRng/postremove.generic.sh rename to trunk/user/LPRng/src/postremove.generic.sh diff --git a/trunk/user/LPRng/postremove.solaris.sh b/trunk/user/LPRng/src/postremove.solaris.sh similarity index 100% rename from trunk/user/LPRng/postremove.solaris.sh rename to trunk/user/LPRng/src/postremove.solaris.sh diff --git a/trunk/user/LPRng/preinstall.solaris.sh b/trunk/user/LPRng/src/preinstall.solaris.sh similarity index 100% rename from trunk/user/LPRng/preinstall.solaris.sh rename to trunk/user/LPRng/src/preinstall.solaris.sh diff --git a/trunk/user/LPRng/preremove.freebsd.sh b/trunk/user/LPRng/src/preremove.freebsd.sh similarity index 100% rename from trunk/user/LPRng/preremove.freebsd.sh rename to trunk/user/LPRng/src/preremove.freebsd.sh diff --git a/trunk/user/LPRng/preremove.generic.sh b/trunk/user/LPRng/src/preremove.generic.sh similarity index 100% rename from trunk/user/LPRng/preremove.generic.sh rename to trunk/user/LPRng/src/preremove.generic.sh diff --git a/trunk/user/LPRng/preremove.linux.sh b/trunk/user/LPRng/src/preremove.linux.sh similarity index 100% rename from trunk/user/LPRng/preremove.linux.sh rename to trunk/user/LPRng/src/preremove.linux.sh diff --git a/trunk/user/LPRng/preremove.solaris.sh b/trunk/user/LPRng/src/preremove.solaris.sh similarity index 100% rename from trunk/user/LPRng/preremove.solaris.sh rename to trunk/user/LPRng/src/preremove.solaris.sh diff --git a/trunk/user/LPRng/printcap b/trunk/user/LPRng/src/printcap similarity index 100% rename from trunk/user/LPRng/printcap rename to trunk/user/LPRng/src/printcap diff --git a/trunk/user/LPRng/printer.c b/trunk/user/LPRng/src/printer.c similarity index 100% rename from trunk/user/LPRng/printer.c rename to trunk/user/LPRng/src/printer.c diff --git a/trunk/user/LPRng/src/.cfg b/trunk/user/LPRng/src/src/.cfg similarity index 100% rename from trunk/user/LPRng/src/.cfg rename to trunk/user/LPRng/src/src/.cfg diff --git a/trunk/user/LPRng/src/AUTHENTICATE/sclient.c b/trunk/user/LPRng/src/src/AUTHENTICATE/sclient.c similarity index 100% rename from trunk/user/LPRng/src/AUTHENTICATE/sclient.c rename to trunk/user/LPRng/src/src/AUTHENTICATE/sclient.c diff --git a/trunk/user/LPRng/src/AUTHENTICATE/sserver.c b/trunk/user/LPRng/src/src/AUTHENTICATE/sserver.c similarity index 100% rename from trunk/user/LPRng/src/AUTHENTICATE/sserver.c rename to trunk/user/LPRng/src/src/AUTHENTICATE/sserver.c diff --git a/trunk/user/LPRng/src/src/Makefile b/trunk/user/LPRng/src/src/Makefile new file mode 100644 index 00000000000..49dde4e96f2 --- /dev/null +++ b/trunk/user/LPRng/src/src/Makefile @@ -0,0 +1,568 @@ +########################################################################## +# LPRng - An Extended Print Spooler System +# +# Copyright 1988-2001 Patrick Powell, San Diego, California +# papowell@lprng.com +# See LICENSE for conditions of use. +# +########################################################################### +# MODULE: Makefile +# Makefile.in,v 1.1 2001/08/21 20:33:17 root Exp +########################################################################### +# + +#************** GENERAL CONFIGURATION INFORMATION ************************ +# where user commands are installed: lpr, lpq, lprm, lpc. +# Also the SysV emulation commands: lp, lpstat. +# If these paths are /usr/lib, /usr/ucb etc., make sure you +# have backup copies of the system version! +# +# +# These are automatically sedded in by the "configure" script, but you +# may need to change them if you're on a strange version of UNIX. + + +PACKAGE=LPRng +VERSION=3.8.22 + +# where the source directory is +SRC=. +top_srcdir=.. +top_builddir=.. +#SRCBASE=../../.. +# which make we are using + + +# what C compiler to use. +#CC:=mipsel-uclibc-gcc +#CC:=gcc +#CC:=mipsel-linux-gcc + +# what command to use to "ranlib" or "lorder" the library. +#RANLIB=mipsel-uclibc-ranlib +#AR=mipsel-uclibc-ar +#RANLIB=mipsel-linux-ranlib +#AR=mipsel-linux-ar + +# what C preprocessor to use. +#CPP:=mipsel-uclibc-gcc -E +#CPP:=gcc -E +#CPP:=mipsel-linux-gcc -E +CPP:= $(CC) -E + +# how to install stuff. +INSTALLCMD=/usr/bin/install -c +# a shell interpreter that's as close to the POSIX shell as possible. +SHELL_PATH=/bin/sh +SHELL = /bin/sh + +# loader for c programs +#LDCC=mipsel-uclibc-gcc +#LDCC=gcc +#LDCC=mipsel-linux-gcc +LDCC=$(CC) + +# any libs that need to be used to get these programs to compile: +LIBS= + +# what libtool +LIBTOOL=$(SHELL) $(top_builddir)/libtool + +### PATHS #### +# prefix +prefix=/usr/local +# exec prefix +exec_prefix=${prefix} +# for binaries +bindir=${exec_prefix}/bin +# for admin type of binaries +sbindir=${exec_prefix}/sbin +# for the filters +libexecdir=${exec_prefix}/libexec +# for the configuration stuff +sysconfdir=${prefix}/etc +# libraries +libdir=${exec_prefix}/lib + +# install options + +STRIP= -s + +CFLAGS+= \ + -I${top_builddir} -I. \ + -I${SRC}/include -I${SRC}/common \ + -g -W -Wall -fcommon -Wno-unused -g -Os -g -W -Wall -Wno-unused -DHAVE_CONFIG_H -DWINDOW_1 -DTEST_WRITE -DNODEBUG -DLPR_with_ASUS ${GLOBAL_OPTIONS} -DUSBONLY #-DRETURNOK + +USER_OBJS := +LDFLAGS += -lshared + +FILTER_DIR = ${libexecdir}/filters +LPD_DIR = ${sbindir} + + +#********************** End of configure modifiable settings ************ + + +#********************** OPTIONAL DEFINITIONS **************************** +# These are various flags and settings that will be used by the +# compiler to generate code +# + +#### ****** TESTING AND SECURITY LOOPHOLE ****************************** +# Define G ETENV to allow the LPD_CONFIG environment +# variable to be used as the name of a configuration file. In non-testing +# systems, this is a security loophole. +#CFLAGS:= $(CFLAGS) -DGETENV=\"1\" + +# Set location of configuration, permissions, and printcap file +# +#GNU + +# CFLAGS:= $(CFLAGS) -DFORMAT_TEST -Wformat + + +##### DMalloc Debugging Package +# +#CFLAGS:= $(CFLAGS) -DDMALLOC +#LIBS:= $(LIBS) -ldmalloc + + + +#********************* OVERRIDING CONFIGURES' GUESSES ****************** +# +# +# If you get errors similar to the ones below, it may be +# because "configure" guessed wrong. You can override the +# guesses here, by uncommenting the appropriate line... + +# "recvfiles.c: unknown struct fsb has no size": +# define STATFS: to use statfs(2) (BSD) +# STATVFS: to use statvfs(2) (SVR4) +# others for system specific cases +# +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=ULTRIX_STATFS +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=SVR3_STATFS +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATVFS +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATFS + +# define MAKE_USE_STTY = +# SGTTYB to use struct sgttyb and (BSD) +# TERMIO to use struct termio and (old sysV) +# TERMIOS to use struct termios and (SVR4) +# +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=SGTTYB +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIO +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIOS + +# a better way to do this is to edit the "ARGH" section of portable.h, +# and add the appropriate lines to the section for your OS, or add a new +# section if one doesn't exist; then you can send me the patches and +# I'll incorporate them into the distribution. + +# +# You might discover that the default locking mechanism +# does not work. Try one of the following to override the +# configured value: fcntl(), lockf(), flock(), and 0 to suppress locking +# +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_fcntl +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_lockf +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_flock +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=0 +# + +# SETPROCTITLE - overwrites the program argument information +# when ps is used, displays status. Used only by LPD +# if this does not work, define the following +# CFLAGS:= $(CFLAGS) -DNO_SETPROCTITLE + + +SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE +INCLUDE=.. ${SRC}/include + +VPATH=..:.:${SRC}/include:${SRC}/common:${SRC} + +######################################################################## + +.SUFFIXES: .lo .sh +LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@ +.c.lo: + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< + +#********************** End of Configurable Part **************************** + +TARGET= \ + lprng_certs lprng_index_certs \ + lpd\ + ./lpd.conf +#TARGET= \ + lprng_certs lprng_index_certs \ + lpc lpd lpq lpr lprm lpf checkpc lp lpstat \ + lpbanner monitor ./lpd.conf + +NONTARGET = sserver sclient + +LPD_OBJS= lpd.o +LPR_OBJS= lpr.o +LPQ_OBJS= lpq.o +LPSTAT_OBJS= lpstat.o +LPRM_OBJS= lprm.o +LPC_OBJS= lpc.o +CHECKPC_OBJS = checkpc.o +LPF_OBJS = lpf.o plp_snprintf.o +MONITOR_OBJS= monitor.o getopt.o +LPBANNER_OBJS= lpbanner.o plp_snprintf.o + +LIBLPR_OBJS = \ + child.lo controlword.lo \ + debug.lo errormsg.lo fileopen.lo gethostinfo.lo \ + getopt.lo getprinter.lo getqueue.lo globmatch.lo \ + initialize.lo \ + linelist.lo linksupport.lo lockfile.lo \ + lpd_control.lo lpd_dispatch.lo lpd_jobs.lo lpd_rcvjob.lo \ + lpd_remove.lo lpd_status.lo \ + permission.lo plp_snprintf.lo printjob.lo\ + proctitle.lo \ + utilities.lo vars.lo $(USER_OBJS) +#LIBLPR_OBJS = \ + accounting.lo child.lo controlword.lo copyright.lo \ + debug.lo errormsg.lo fileopen.lo gethostinfo.lo \ + getopt.lo getprinter.lo getqueue.lo globmatch.lo \ + initialize.lo krb5_auth.lo \ + linelist.lo linksupport.lo lockfile.lo \ + lpd_control.lo lpd_dispatch.lo lpd_jobs.lo lpd_logger.lo lpd_rcvjob.lo \ + lpd_remove.lo sendauth.lo lpd_secure.lo lpd_status.lo \ + merge.lo permission.lo plp_snprintf.lo printjob.lo \ + proctitle.lo sendjob.lo sendmail.lo sendreq.lo ssl_auth.lo \ + stty.lo user_auth.lo utilities.lo vars.lo md5.lo $(USER_OBJS) + +ALL_OBJS = $(LIBLPR_OBJS) \ + $(LPD_OBJS) \ + +#ALL_OBJS = $(LIBLPR_OBJS) \ + $(LPR_OBJS) $(LPQ_OBJS) $(LPC_OBJS) $(LPRM_OBJS) $(LPD_OBJS) \ + $(CHECKPC_OBJS) $(LPF_OBJS) $(LPRACCNT_OBJS) $(MONITOR_OBJS) $(LPBANNER_OBJS) + +all: $(TARGET) + +relink: + rm -f ${TARGET} + +defs.h: Makefile + cp /dev/null $@ + echo "#define " CHOWN \"/bin/chown\" >>$@ + echo "#define " CHGRP \"/bin/chgrp\" >>$@ + echo "#define " PRINTCAP_PATH \"${sysconfdir}/printcap\" >>$@ + echo "#define " LPD_PRINTCAP_PATH \"${sysconfdir}/lpd/lpd_printcap\" >>$@ + echo "#define " LPD_PERMS_PATH \"${sysconfdir}/lpd/lpd.perms\" >>$@ + echo "#define " LPD_CONF_PATH \"${sysconfdir}/lpd/lpd.conf\" >>$@ + echo "#define " REQUIRE_CONFIGFILES \"1\" >>$@ + echo "#define " FILTER_PATH \"/bin:/usr/bin:/usr/local/bin\" >>$@ + echo "#define " LD_LIBRARY_PATH \"/lib:/usr/lib:/usr/local/lib\" >>$@ + echo "#define " LOCKFILE \"/var/run/lpd\" >>$@ + echo "#define " CLEAR \"/usr/bin/clear\" >>$@ + echo "#define " USERID \"root\" >>$@ + echo "#define " GROUPID \"root\" >>$@ + echo "#define " LOCALEDIR \"${prefix}/share/locale\" >>$@ + echo "#define " DONE_JOBS \"1\" >>$@ + echo "#define " DONE_JOBS_MAX_AGE \"0\" >>$@ + echo "#define " UNIXSOCKETPATH \"/var/run/lprng\" >>$@ + echo "#define " PRUTIL \"/usr/bin/pr\" >>$@ + echo "#define " OPENSSL \"/usr/bin/openssl\" >>$@ + echo "#define " SSL_CA_FILE \"${sysconfdir}/lpd/ssl.ca/ca.crt\" >>$@ + echo "#define " SSL_CA_KEY \"${sysconfdir}/lpd/ssl.ca/ca.key\" >>$@ + echo "#define " SSL_CRL_FILE \"${sysconfdir}/lpd/ssl.crl/ssl.crl\" >>$@ + echo "#define " SSL_CERTS_DIR \"${sysconfdir}/lpd/ssl.certs\" >>$@ + echo "#define " SSL_SERVER_CERT \"${sysconfdir}/lpd/ssl.server/server.crt\" >>$@ + echo "#define " SSL_SERVER_PASSWORD_FILE \"${sysconfdir}/lpd/ssl.server/server.pwd\" >>$@ + +.PHONY: all ci clean \ + uninstall realclean mostlyclean distclean \ + TAGS info generate + +# we want to force defaults to be updated whenever we +# change the options in Makefile or Makefile.bsd +#GNU +vars.o vars.lo: Makefile +# +#BSD vars.o: Makefile.bsd + +# +# use RANLIB with no ordering, or lorder/tsort if it is there +# if you do not have either, fall back and just build archive +# This appears to cover all cases for portability +# + + +liblpr.la: $(LIBLPR_OBJS) + $(LINK) $(LIBLPR_OBJS) -rpath ${libdir} + +lpd: $(LPD_OBJS) liblpr.la + $(LINK) ${LPD_OBJS} liblpr.la $(LIBS) +#lpr: $(LPR_OBJS) liblpr.la +# $(LINK) ${LPR_OBJS} liblpr.la $(LIBS) +#lpq: $(LPQ_OBJS) liblpr.la +# $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS) +#lpstat: $(LPSTAT_OBJS) liblpr.la +# $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS) +#lprm: $(LPRM_OBJS) liblpr.la +# $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS) +#lpc: $(LPC_OBJS) liblpr.la +# $(LINK) ${LPC_OBJS} liblpr.la $(LIBS) +#checkpc: $(CHECKPC_OBJS) liblpr.la +# $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS) +#lpf: $(LPF_OBJS) liblpr.la +# $(LINK) ${LPF_OBJS} $(LIBS) +#lpbanner: $(LPBANNER_OBJS) liblpr.la +# $(LINK) ${LPBANNER_OBJS} $(LIBS) +#monitor: $(MONITOR_OBJS) liblpr.la +# $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS) + +authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh + rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@ + +sserver: sserver.o liblpr.la + $(LINK) sserver liblpr.la $(LIBS) +sclient: sclient.o liblpr.la + $(LINK) sclient liblpr.la $(LIBS) + +cancel: + rm -f $@; ln -s lprm $@ +lp: lpr + rm -f $@; ln -s lpr $@ + +########################################################################### +# lpd.conf + +./lpd.conf: Makefile vars.c + set -e; \ + rm -f $@ ; \ + echo "# lpd.conf" >/tmp/$@.$$$$ ; \ + echo "# VERSION=$(VERSION)" >>/tmp/$@.$$$$ ; \ + $(CPP) $(CFLAGS) -C ${SRC}/common/vars.c \ + | /bin/sh ../UTILS/make_lpd_conf >>/tmp/$@.$$$$ ; \ + chmod 644 /tmp/$@.$$$$ ; \ + cp /tmp/$@.$$$$ $@ ; rm /tmp/$@.$$$$ + +.sh: + set -e ; \ + rm -f $@ ; \ + sed \ + -e "s,@OPENSSL.,/usr/bin/openssl," \ + -e "s,@SSL_CA_FILE.,${sysconfdir}/lpd/ssl.ca/ca.crt," \ + -e "s,@SSL_CA_KEY.,${sysconfdir}/lpd/ssl.ca/ca.key," \ + -e "s,@SSL_CRL_FILE.,${sysconfdir}/lpd/ssl.crl/ssl.crl," \ + -e "s,@SSL_SERVER_CERT.,${sysconfdir}/lpd/ssl.server/server.crt," \ + -e "s,@SSL_SERVER_PASSWORD_FILE.,${sysconfdir}/lpd/ssl.server/server.pwd," \ + -e "s,@SSL_CERTS_DIR.,${sysconfdir}/lpd/ssl.certs," \ + $< >$@ + chmod 755 $@ + +lprng_certs: Makefile lprng_certs.sh +lprng_index_certs: Makefile lprng_index_certs.sh + +########################################################################### +# + +NORM_PERMS=0755 +SUID_ROOT_PERMS=04755 -o root + +########################################################################### + +install: all + echo "Clients are being installed NORM_PERMS"; + for i in ${DESTDIR}${bindir} ${DESTDIR}${sbindir} \ + $(DESTDIR)$(libdir) ${DESTDIR}${sysconfdir} \ + ${DESTDIR}${LPD_DIR} ${DESTDIR}${FILTER_DIR}; do \ + if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \ + done; + + ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpq ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lprm ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpr ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpstat ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpc ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_certs ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_index_certs ${DESTDIR}${sbindir} + cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel; + +uninstall: + +########################################################################### + + +clean:: + -rm -rf *.o *.tmp *core *.a ? ?.bak ?.orig $(TARGET) $(NONTARGET) st[0-9]* \ + tags ./lpd.conf */*.old */*.bak */*.orig .libs *.lo *.la log defs.h + +realclean mostlyclean distclean:: clean + -rm -f Makefile Makefile.bsd pclbanner psbanner + +info: +tags TAGS: + ctags -t -d `ls common/*.c include/*.h | sed -e '/checkpc.c/d' ` + +########################################################################### + +CI= +#CO=-kv +CO=-l + +cifiles: + if [ ! -d RCS ] ; then mkdir RCS ; fi ; + checkin() { \ + (set +e; rcs -l $$1; exit 0); \ + ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ + }; \ + for i in *; do \ + if [ -f "$$i" ] ; then \ + case $$i in \ + Makefile*|*install* ) echo $$i; checkin $$i ;; \ + *.in ) echo $$i; checkin $$i ;; \ + esac; \ + fi; \ + done; + +cifast ci: cifiles + checkin() { \ + (set +e; rcs -l $$1; exit 0); \ + ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ + }; \ + for i in *; do \ + if [ -d "$$i" ] ; then \ + case $$i in \ + RCS ) ;; \ + * ) if [ ! -d $$i/RCS ] ; then mkdir $$i/RCS ; fi ; \ + for j in $$i/*; do \ + if [ -f "$$j" ] ; then \ + checkin $$j; \ + fi; \ + done; \ + ;; \ + esac; \ + fi; \ + done; + +depend: /tmp/dep /tmp/order + ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile.in; \ + echo ; echo; \ + echo "########### LIBRARY ORDER #########"; \ + cat /tmp/order; \ + echo ; echo; \ + echo "########### DEPENDENCIES #########"; \ + cat /tmp/dep; ) >/tmp/Makefile.in + mv ${SRC}/Makefile.in ${SRC}/Makefile.in.old + cp /tmp/Makefile.in ${SRC}/Makefile.in + ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile; \ + echo ; echo; \ + echo "########### LIBRARY ORDER #########"; \ + cat /tmp/order; \ + echo ; echo; \ + echo "########### DEPENDENCIES #########"; \ + cat /tmp/dep; ) >/tmp/Makefile + mv ${SRC}/Makefile ${SRC}/Makefile.old + cp /tmp/Makefile ${SRC}/Makefile + +/tmp/dep:: Makefile +/tmp/dep:: $(ALL_OBJS) + CFLAGS="${CFLAGS}" ${SRC}/../UTILS/makeinc $(ALL_OBJS) >$@ + +# make the order in which library files should be loader +# this requires hand tuning the makefile, but it is easier than +# trying to fix up things with conditional tests +# +/tmp/order:: Makefile +/tmp/order:: $(LIBLPR_OBJS) + lorder ` echo $(LIBLPR_OBJS) | sed -e 's/\.lo/.o/g'` |tsort >/tmp/raw + awk '\ + BEGIN { print "LIBLPR_ORDER = \\"; } \ + { line = line " " $$0; \ + if( ++i >= 4 ){ \ + print "\t" line "\\"; \ + line = ""; \ + i = 0; \ + } \ + } \ + END { \ + if( line != "" ){ \ + print "\t" line; \ + } \ + }' /tmp/raw >/tmp/order + + +############# GENERATED ################################################### + + +########### LIBRARY ORDER ######### +LIBLPR_ORDER = \ + krb5_auth.o initialize.o getopt.o copyright.o\ + proctitle.o utilities.o user_auth.o md5.o\ + ssl_auth.o stty.o sendreq.o sendmail.o\ + sendjob.o sendauth.o printjob.o permission.o\ + merge.o lpd_status.o lpd_secure.o lpd_remove.o\ + lpd_rcvjob.o lpd_logger.o lpd_jobs.o lockfile.o\ + accounting.o lpd_dispatch.o lpd_control.o debug.o\ + controlword.o linksupport.o linelist.o gethostinfo.o\ + globmatch.o getqueue.o getprinter.o fileopen.o\ + errormsg.o child.o vars.o plp_snprintf.o\ + + +########### DEPENDENCIES ######### +accounting.o accounting.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +child.o child.lo : config.h child.h debug.h errormsg.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +controlword.o controlword.lo : config.h control.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +copyright.o copyright.lo : config.h copyright.h debug.h errormsg.h license.h linelist.h lp.h patchlevel.h plp_snprintf.h portable.h utilities.h utilities.h +debug.o debug.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +errormsg.o errormsg.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +fileopen.o fileopen.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +gethostinfo.o gethostinfo.lo : config.h debug.h errormsg.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getprinter.o getprinter.lo : config.h child.h debug.h errormsg.h gethostinfo.h getprinter.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getqueue.o getqueue.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h merge.h permission.h plp_snprintf.h portable.h utilities.h utilities.h +globmatch.o globmatch.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +initialize.o initialize.lo : config.h defs.h child.h debug.h errorcodes.h errormsg.h gethostinfo.h getopt.h getqueue.h initialize.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +krb5_auth.o krb5_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h permission.h plp_snprintf.h portable.h utilities.h utilities.h +linelist.o linelist.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_dispatch.h lpd_jobs.h lpd_logger.h plp_snprintf.h portable.h utilities.h utilities.h +linksupport.o linksupport.lo : config.h debug.h errorcodes.h errormsg.h gethostinfo.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +lockfile.o lockfile.lo : config.h debug.h errormsg.h fileopen.h linelist.h lockfile.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +lpd_control.o lpd_control.lo : config.h child.h control.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_control.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_dispatch.o lpd_dispatch.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_control.h lpd_dispatch.h lpd_rcvjob.h lpd_remove.h lpd_secure.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_jobs.o lpd_jobs.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h merge.h permission.h plp_snprintf.h portable.h printjob.h proctitle.h sendjob.h sendmail.h stty.h utilities.h utilities.h +lpd_logger.o lpd_logger.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lp.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_rcvjob.o lpd_rcvjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_remove.o lpd_remove.lo : config.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h lp.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h +sendauth.o sendauth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h +lpd_secure.o lpd_secure.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_jobs.h lpd_rcvjob.h lpd_secure.h permission.h plp_snprintf.h portable.h proctitle.h user_auth.h utilities.h utilities.h +lpd_status.o lpd_status.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h lpd_jobs.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h +merge.o merge.lo : config.h debug.h errormsg.h linelist.h lp.h merge.h plp_snprintf.h portable.h utilities.h utilities.h +permission.o permission.lo : config.h debug.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h utilities.h utilities.h +plp_snprintf.o plp_snprintf.lo : config.h config.h +printjob.o printjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h +proctitle.o proctitle.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +sendjob.o sendjob.lo : config.h accounting.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h +sendmail.o sendmail.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h sendmail.h utilities.h utilities.h +sendreq.o sendreq.lo : config.h child.h debug.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h readstatus.h sendauth.h sendreq.h user_auth.h utilities.h utilities.h +ssl_auth.o ssl_auth.lo : config.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h lpd_secure.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h +stty.o stty.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h stty.h utilities.h utilities.h +user_auth.o user_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h md5.h permission.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h +utilities.o utilities.lo : config.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +vars.o vars.lo : config.h defs.h accounting.h child.h debug.h errormsg.h gethostinfo.h getqueue.h linelist.h lp.h permission.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h +md5.o md5.lo : md5.h md5.h +lpr.o lpr.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpd_jobs.h lpr.h patchlevel.h plp_snprintf.h portable.h printjob.h sendjob.h utilities.h utilities.h +lpq.o lpq.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpq.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h +lpc.o lpc.lo : config.h defs.h child.h control.h debug.h errorcodes.h errormsg.h getopt.h getprinter.h initialize.h linelist.h lp.h lpc.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h +lprm.o lprm.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lprm.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h +lpd.o lpd.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +checkpc.o checkpc.lo : config.h defs.h checkpc.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd_remove.h patchlevel.h plp_snprintf.h portable.h proctitle.h stty.h utilities.h utilities.h +lpf.o lpf.lo : config.h portable.h portable.h +plp_snprintf.o plp_snprintf.lo : config.h config.h +monitor.o monitor.lo : config.h debug.h errormsg.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +lpbanner.o lpbanner.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +plp_snprintf.o plp_snprintf.lo : config.h config.h diff --git a/trunk/user/LPRng/src/Makefile.brcm b/trunk/user/LPRng/src/src/Makefile.brcm similarity index 100% rename from trunk/user/LPRng/src/Makefile.brcm rename to trunk/user/LPRng/src/src/Makefile.brcm diff --git a/trunk/user/LPRng/src/src/Makefile.in b/trunk/user/LPRng/src/src/Makefile.in new file mode 100644 index 00000000000..31e46f9cba3 --- /dev/null +++ b/trunk/user/LPRng/src/src/Makefile.in @@ -0,0 +1,538 @@ +########################################################################## +# LPRng - An Extended Print Spooler System +# +# Copyright 1988-2001 Patrick Powell, San Diego, California +# papowell@lprng.com +# See LICENSE for conditions of use. +# +########################################################################### +# MODULE: Makefile +# Makefile.in,v 1.1 2001/08/21 20:33:17 root Exp +########################################################################### +# + +#************** GENERAL CONFIGURATION INFORMATION ************************ +# where user commands are installed: lpr, lpq, lprm, lpc. +# Also the SysV emulation commands: lp, lpstat. +# If these paths are /usr/lib, /usr/ucb etc., make sure you +# have backup copies of the system version! +# +# +# These are automatically sedded in by the "configure" script, but you +# may need to change them if you're on a strange version of UNIX. + + +PACKAGE=@PACKAGE@ +VERSION=@VERSION@ + +# where the source directory is +SRC=@srcdir@ +top_srcdir=@top_srcdir@ +top_builddir=.. +# which make we are using +@SET_MAKE@ + +# what C compiler to use. +CC:=@CC@ + +# what command to use to "ranlib" or "lorder" the library. +RANLIB=@RANLIB@ + +# what C preprocessor to use. +CPP:=@CPP@ + +# how to install stuff. +INSTALLCMD=@INSTALL@ +# a shell interpreter that's as close to the POSIX shell as possible. +SHELL_PATH=@SHELL@ +SHELL = @SHELL@ + +# loader for c programs +LDCC=@LDCC@ + +# any libs that need to be used to get these programs to compile: +LIBS= @LIBS@ @LTLIBINTL@ + +# what libtool +LIBTOOL=@LIBTOOL@ + +### PATHS #### +# prefix +prefix=@prefix@ +# exec prefix +exec_prefix=@exec_prefix@ +# for binaries +bindir=@bindir@ +# for admin type of binaries +sbindir=@sbindir@ +# for the filters +libexecdir=@libexecdir@ +# for the configuration stuff +sysconfdir=@sysconfdir@ +# libraries +libdir=@libdir@ + +# install options + +STRIP=@STRIP_OPTION@ + +CFLAGS:= \ + -I${top_builddir} -I. \ + -I${SRC}/include -I${SRC}/common \ + @CPPFLAGS@ @CFLAGS@ @DEFS@ + +USER_OBJS := @USER_OBJS@ +LDFLAGS := @LDFLAGS@ + +FILTER_DIR = @FILTER_DIR@ +LPD_DIR = @LPD_DIR@ + + +#********************** End of configure modifiable settings ************ + + +#********************** OPTIONAL DEFINITIONS **************************** +# These are various flags and settings that will be used by the +# compiler to generate code +# + +#### ****** TESTING AND SECURITY LOOPHOLE ****************************** +# Define G ETENV to allow the LPD_CONFIG environment +# variable to be used as the name of a configuration file. In non-testing +# systems, this is a security loophole. +#CFLAGS:= $(CFLAGS) -DGETENV=\"1\" + +# Set location of configuration, permissions, and printcap file +# +#GNU + +# CFLAGS:= $(CFLAGS) -DFORMAT_TEST -Wformat + + +##### DMalloc Debugging Package +# +#CFLAGS:= $(CFLAGS) -DDMALLOC +#LIBS:= $(LIBS) -ldmalloc + + + +#********************* OVERRIDING CONFIGURES' GUESSES ****************** +# +# +# If you get errors similar to the ones below, it may be +# because "configure" guessed wrong. You can override the +# guesses here, by uncommenting the appropriate line... + +# "recvfiles.c: unknown struct fsb has no size": +# define STATFS: to use statfs(2) (BSD) +# STATVFS: to use statvfs(2) (SVR4) +# others for system specific cases +# +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=ULTRIX_STATFS +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=SVR3_STATFS +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATVFS +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STATFS=STATFS + +# define MAKE_USE_STTY = +# SGTTYB to use struct sgttyb and (BSD) +# TERMIO to use struct termio and (old sysV) +# TERMIOS to use struct termios and (SVR4) +# +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=SGTTYB +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIO +# CFLAGS:= $(CFLAGS) -DMAKE_USE_STTY=TERMIOS + +# a better way to do this is to edit the "ARGH" section of portable.h, +# and add the appropriate lines to the section for your OS, or add a new +# section if one doesn't exist; then you can send me the patches and +# I'll incorporate them into the distribution. + +# +# You might discover that the default locking mechanism +# does not work. Try one of the following to override the +# configured value: fcntl(), lockf(), flock(), and 0 to suppress locking +# +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_fcntl +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_lockf +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=devlock_flock +# CFLAGS:= $(CFLAGS) -DLOCK_DEVS=0 +# + +# SETPROCTITLE - overwrites the program argument information +# when ps is used, displays status. Used only by LPD +# if this does not work, define the following +# CFLAGS:= $(CFLAGS) -DNO_SETPROCTITLE + + +SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE +INCLUDE=.. ${SRC}/include + +VPATH=..:.:${SRC}/include:${SRC}/common:${SRC} + +######################################################################## + +.SUFFIXES: .lo .sh +LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@ +.c.lo: + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< + +#********************** End of Configurable Part **************************** + +TARGET= \ + lprng_certs lprng_index_certs \ + lpc lpd lpq lpr lprm lpf checkpc lp lpstat \ + lpbanner monitor ./lpd.conf + +NONTARGET = sserver sclient + +LPD_OBJS= lpd.o +LPR_OBJS= lpr.o +LPQ_OBJS= lpq.o +LPSTAT_OBJS= lpstat.o +LPRM_OBJS= lprm.o +LPC_OBJS= lpc.o +CHECKPC_OBJS = checkpc.o +LPF_OBJS = lpf.o plp_snprintf.o +MONITOR_OBJS= monitor.o getopt.o +LPBANNER_OBJS= lpbanner.o plp_snprintf.o + +LIBLPR_OBJS = \ + accounting.lo child.lo controlword.lo copyright.lo \ + debug.lo errormsg.lo fileopen.lo gethostinfo.lo \ + getopt.lo getprinter.lo getqueue.lo globmatch.lo \ + initialize.lo krb5_auth.lo \ + linelist.lo linksupport.lo lockfile.lo \ + lpd_control.lo lpd_dispatch.lo lpd_jobs.lo lpd_logger.lo lpd_rcvjob.lo \ + lpd_remove.lo sendauth.lo lpd_secure.lo lpd_status.lo \ + merge.lo permission.lo plp_snprintf.lo printjob.lo \ + proctitle.lo sendjob.lo sendmail.lo sendreq.lo ssl_auth.lo \ + stty.lo user_auth.lo utilities.lo vars.lo md5.lo $(USER_OBJS) + +ALL_OBJS = $(LIBLPR_OBJS) \ + $(LPR_OBJS) $(LPQ_OBJS) $(LPC_OBJS) $(LPRM_OBJS) $(LPD_OBJS) \ + $(CHECKPC_OBJS) $(LPF_OBJS) $(LPRACCNT_OBJS) $(MONITOR_OBJS) $(LPBANNER_OBJS) + +all: $(TARGET) + +relink: + rm -f ${TARGET} + +defs.h: Makefile + cp /dev/null $@ + echo "#define " CHOWN \"@CHOWN@\" >>$@ + echo "#define " CHGRP \"@CHGRP@\" >>$@ + echo "#define " PRINTCAP_PATH \"@PRINTCAP_PATH@\" >>$@ + echo "#define " LPD_PRINTCAP_PATH \"@LPD_PRINTCAP_PATH@\" >>$@ + echo "#define " LPD_PERMS_PATH \"@LPD_PERMS_PATH@\" >>$@ + echo "#define " LPD_CONF_PATH \"@LPD_CONF_PATH@\" >>$@ + echo "#define " REQUIRE_CONFIGFILES \"@REQUIRE_CONFIGFILES@\" >>$@ + echo "#define " FILTER_PATH \"@FILTER_PATH@\" >>$@ + echo "#define " LD_LIBRARY_PATH \"@LD_LIBRARY_PATH@\" >>$@ + echo "#define " LOCKFILE \"@LOCKFILE@\" >>$@ + echo "#define " CLEAR \"@CLEAR@\" >>$@ + echo "#define " USERID \"@USERID@\" >>$@ + echo "#define " GROUPID \"@GROUPID@\" >>$@ + echo "#define " LOCALEDIR \"@LOCALEDIR@\" >>$@ + echo "#define " DONE_JOBS \"@DONE_JOBS@\" >>$@ + echo "#define " DONE_JOBS_MAX_AGE \"@DONE_JOBS_MAX_AGE@\" >>$@ + echo "#define " UNIXSOCKETPATH \"@UNIXSOCKETPATH@\" >>$@ + echo "#define " PRUTIL \"@PRUTIL@\" >>$@ + echo "#define " OPENSSL \"@OPENSSL@\" >>$@ + echo "#define " SSL_CA_FILE \"@SSL_CA_FILE@\" >>$@ + echo "#define " SSL_CA_KEY \"@SSL_CA_KEY@\" >>$@ + echo "#define " SSL_CRL_FILE \"@SSL_CRL_FILE@\" >>$@ + echo "#define " SSL_CERTS_DIR \"@SSL_CERTS_DIR@\" >>$@ + echo "#define " SSL_SERVER_CERT \"@SSL_SERVER_CERT@\" >>$@ + echo "#define " SSL_SERVER_PASSWORD_FILE \"@SSL_SERVER_PASSWORD_FILE@\" >>$@ + +.PHONY: all ci clean \ + uninstall realclean mostlyclean distclean \ + TAGS info generate + +# we want to force defaults to be updated whenever we +# change the options in Makefile or Makefile.bsd +#GNU +vars.o vars.lo: Makefile +# +#BSD vars.o: Makefile.bsd + +# +# use RANLIB with no ordering, or lorder/tsort if it is there +# if you do not have either, fall back and just build archive +# This appears to cover all cases for portability +# + + +liblpr.la: $(LIBLPR_OBJS) + $(LINK) $(LIBLPR_OBJS) -rpath ${libdir} + +lpd: $(LPD_OBJS) liblpr.la + $(LINK) ${LPD_OBJS} liblpr.la $(LIBS) +lpr: $(LPR_OBJS) liblpr.la + $(LINK) ${LPR_OBJS} liblpr.la $(LIBS) +lpq: $(LPQ_OBJS) liblpr.la + $(LINK) ${LPQ_OBJS} liblpr.la $(LIBS) +lpstat: $(LPSTAT_OBJS) liblpr.la + $(LINK) ${LPSTAT_OBJS} liblpr.la $(LIBS) +lprm: $(LPRM_OBJS) liblpr.la + $(LINK) ${LPRM_OBJS} liblpr.la $(LIBS) +lpc: $(LPC_OBJS) liblpr.la + $(LINK) ${LPC_OBJS} liblpr.la $(LIBS) +checkpc: $(CHECKPC_OBJS) liblpr.la + $(LINK) ${CHECKPC_OBJS} liblpr.la $(LIBS) +lpf: $(LPF_OBJS) liblpr.la + $(LINK) ${LPF_OBJS} $(LIBS) +lpbanner: $(LPBANNER_OBJS) liblpr.la + $(LINK) ${LPBANNER_OBJS} $(LIBS) +monitor: $(MONITOR_OBJS) liblpr.la + $(LINK) ${MONITOR_OBJS} liblpr.la $(LIBS) + +authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh + rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@ + +sserver: sserver.o liblpr.la + $(LINK) sserver liblpr.la $(LIBS) +sclient: sclient.o liblpr.la + $(LINK) sclient liblpr.la $(LIBS) + +cancel: + rm -f $@; ln -s lprm $@ +lp: lpr + rm -f $@; ln -s lpr $@ + +########################################################################### +# lpd.conf + +./lpd.conf: Makefile vars.c + set -e; \ + rm -f $@ ; \ + echo "# lpd.conf" >/tmp/$@.$$$$ ; \ + echo "# VERSION=$(VERSION)" >>/tmp/$@.$$$$ ; \ + $(CPP) $(CFLAGS) -C ${SRC}/common/vars.c \ + | /bin/sh ../UTILS/make_lpd_conf >>/tmp/$@.$$$$ ; \ + chmod 644 /tmp/$@.$$$$ ; \ + cp /tmp/$@.$$$$ $@ ; rm /tmp/$@.$$$$ + +.sh: + set -e ; \ + rm -f $@ ; \ + sed \ + -e "s,@OPENSSL.,@OPENSSL@," \ + -e "s,@SSL_CA_FILE.,@SSL_CA_FILE@," \ + -e "s,@SSL_CA_KEY.,@SSL_CA_KEY@," \ + -e "s,@SSL_CRL_FILE.,@SSL_CRL_FILE@," \ + -e "s,@SSL_SERVER_CERT.,@SSL_SERVER_CERT@," \ + -e "s,@SSL_SERVER_PASSWORD_FILE.,@SSL_SERVER_PASSWORD_FILE@," \ + -e "s,@SSL_CERTS_DIR.,@SSL_CERTS_DIR@," \ + $< >$@ + chmod 755 $@ + +lprng_certs: Makefile lprng_certs.sh +lprng_index_certs: Makefile lprng_index_certs.sh + +########################################################################### +# + +NORM_PERMS=0755 +SUID_ROOT_PERMS=04755 -o root + +########################################################################### + +install: all + echo "Clients are being installed @PERMS@"; + for i in ${DESTDIR}${bindir} ${DESTDIR}${sbindir} \ + $(DESTDIR)$(libdir) ${DESTDIR}${sysconfdir} \ + ${DESTDIR}${LPD_DIR} ${DESTDIR}${FILTER_DIR}; do \ + if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \ + done; + + ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR} + ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_certs ${DESTDIR}${sbindir} + ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lprng_index_certs ${DESTDIR}${sbindir} + cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel; + +uninstall: + +########################################################################### + + +clean:: + -rm -rf *.o *.tmp *core *.a ? ?.bak ?.orig $(TARGET) $(NONTARGET) st[0-9]* \ + tags ./lpd.conf */*.old */*.bak */*.orig .libs *.lo *.la log defs.h + +realclean mostlyclean distclean:: clean + -rm -f Makefile Makefile.bsd pclbanner psbanner + +info: +tags TAGS: + ctags -t -d `ls common/*.c include/*.h | sed -e '/checkpc.c/d' ` + +########################################################################### + +CI= +#CO=-kv +CO=-l + +cifiles: + if [ ! -d RCS ] ; then mkdir RCS ; fi ; + checkin() { \ + (set +e; rcs -l $$1; exit 0); \ + ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ + }; \ + for i in *; do \ + if [ -f "$$i" ] ; then \ + case $$i in \ + Makefile*|*install* ) echo $$i; checkin $$i ;; \ + *.in ) echo $$i; checkin $$i ;; \ + esac; \ + fi; \ + done; + +cifast ci: cifiles + checkin() { \ + (set +e; rcs -l $$1; exit 0); \ + ci $(CI) -l -u -f -mUpdate -t-Initial $$1; \ + }; \ + for i in *; do \ + if [ -d "$$i" ] ; then \ + case $$i in \ + RCS ) ;; \ + * ) if [ ! -d $$i/RCS ] ; then mkdir $$i/RCS ; fi ; \ + for j in $$i/*; do \ + if [ -f "$$j" ] ; then \ + checkin $$j; \ + fi; \ + done; \ + ;; \ + esac; \ + fi; \ + done; + +depend: /tmp/dep /tmp/order + ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile.in; \ + echo ; echo; \ + echo "########### LIBRARY ORDER #########"; \ + cat /tmp/order; \ + echo ; echo; \ + echo "########### DEPENDENCIES #########"; \ + cat /tmp/dep; ) >/tmp/Makefile.in + mv ${SRC}/Makefile.in ${SRC}/Makefile.in.old + cp /tmp/Makefile.in ${SRC}/Makefile.in + ( sed -n '1,/^##.*GENERATED/p' ${SRC}/Makefile; \ + echo ; echo; \ + echo "########### LIBRARY ORDER #########"; \ + cat /tmp/order; \ + echo ; echo; \ + echo "########### DEPENDENCIES #########"; \ + cat /tmp/dep; ) >/tmp/Makefile + mv ${SRC}/Makefile ${SRC}/Makefile.old + cp /tmp/Makefile ${SRC}/Makefile + +/tmp/dep:: Makefile +/tmp/dep:: $(ALL_OBJS) + CFLAGS="${CFLAGS}" ${SRC}/../UTILS/makeinc $(ALL_OBJS) >$@ + +# make the order in which library files should be loader +# this requires hand tuning the makefile, but it is easier than +# trying to fix up things with conditional tests +# +/tmp/order:: Makefile +/tmp/order:: $(LIBLPR_OBJS) + lorder ` echo $(LIBLPR_OBJS) | sed -e 's/\.lo/.o/g'` |tsort >/tmp/raw + awk '\ + BEGIN { print "LIBLPR_ORDER = \\"; } \ + { line = line " " $$0; \ + if( ++i >= 4 ){ \ + print "\t" line "\\"; \ + line = ""; \ + i = 0; \ + } \ + } \ + END { \ + if( line != "" ){ \ + print "\t" line; \ + } \ + }' /tmp/raw >/tmp/order + + +############# GENERATED ################################################### + + +########### LIBRARY ORDER ######### +LIBLPR_ORDER = \ + krb5_auth.o initialize.o getopt.o copyright.o\ + proctitle.o utilities.o user_auth.o md5.o\ + ssl_auth.o stty.o sendreq.o sendmail.o\ + sendjob.o sendauth.o printjob.o permission.o\ + merge.o lpd_status.o lpd_secure.o lpd_remove.o\ + lpd_rcvjob.o lpd_logger.o lpd_jobs.o lockfile.o\ + accounting.o lpd_dispatch.o lpd_control.o debug.o\ + controlword.o linksupport.o linelist.o gethostinfo.o\ + globmatch.o getqueue.o getprinter.o fileopen.o\ + errormsg.o child.o vars.o plp_snprintf.o\ + + +########### DEPENDENCIES ######### +accounting.o accounting.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +child.o child.lo : config.h child.h debug.h errormsg.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +controlword.o controlword.lo : config.h control.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +copyright.o copyright.lo : config.h copyright.h debug.h errormsg.h license.h linelist.h lp.h patchlevel.h plp_snprintf.h portable.h utilities.h utilities.h +debug.o debug.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +errormsg.o errormsg.lo : config.h child.h debug.h errorcodes.h errormsg.h getopt.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +fileopen.o fileopen.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +gethostinfo.o gethostinfo.lo : config.h debug.h errormsg.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getprinter.o getprinter.lo : config.h child.h debug.h errormsg.h gethostinfo.h getprinter.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getqueue.o getqueue.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h merge.h permission.h plp_snprintf.h portable.h utilities.h utilities.h +globmatch.o globmatch.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +initialize.o initialize.lo : config.h defs.h child.h debug.h errorcodes.h errormsg.h gethostinfo.h getopt.h getqueue.h initialize.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +krb5_auth.o krb5_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h permission.h plp_snprintf.h portable.h utilities.h utilities.h +linelist.o linelist.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_dispatch.h lpd_jobs.h lpd_logger.h plp_snprintf.h portable.h utilities.h utilities.h +linksupport.o linksupport.lo : config.h debug.h errorcodes.h errormsg.h gethostinfo.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +lockfile.o lockfile.lo : config.h debug.h errormsg.h fileopen.h linelist.h lockfile.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +lpd_control.o lpd_control.lo : config.h child.h control.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lp.h lpd_control.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_dispatch.o lpd_dispatch.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getprinter.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_control.h lpd_dispatch.h lpd_rcvjob.h lpd_remove.h lpd_secure.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_jobs.o lpd_jobs.lo : config.h accounting.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h merge.h permission.h plp_snprintf.h portable.h printjob.h proctitle.h sendjob.h sendmail.h stty.h utilities.h utilities.h +lpd_logger.o lpd_logger.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getprinter.h getqueue.h linelist.h linksupport.h lp.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_rcvjob.o lpd_rcvjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getqueue.h linelist.h linksupport.h lockfile.h lp.h lpd_jobs.h lpd_rcvjob.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +lpd_remove.o lpd_remove.lo : config.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h linelist.h lp.h lpd_remove.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h +sendauth.o sendauth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h +lpd_secure.o lpd_secure.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h globmatch.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_jobs.h lpd_rcvjob.h lpd_secure.h permission.h plp_snprintf.h portable.h proctitle.h user_auth.h utilities.h utilities.h +lpd_status.o lpd_status.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h globmatch.h linelist.h lockfile.h lp.h lpd_jobs.h lpd_status.h permission.h plp_snprintf.h portable.h proctitle.h sendreq.h utilities.h utilities.h +merge.o merge.lo : config.h debug.h errormsg.h linelist.h lp.h merge.h plp_snprintf.h portable.h utilities.h utilities.h +permission.o permission.lo : config.h debug.h errormsg.h fileopen.h gethostinfo.h getqueue.h globmatch.h linelist.h linksupport.h lp.h permission.h plp_snprintf.h portable.h utilities.h utilities.h +plp_snprintf.o plp_snprintf.lo : config.h config.h +printjob.o printjob.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h +proctitle.o proctitle.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +sendjob.o sendjob.lo : config.h accounting.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h sendauth.h sendjob.h user_auth.h utilities.h utilities.h +sendmail.o sendmail.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h plp_snprintf.h portable.h sendmail.h utilities.h utilities.h +sendreq.o sendreq.lo : config.h child.h debug.h errormsg.h fileopen.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h readstatus.h sendauth.h sendreq.h user_auth.h utilities.h utilities.h +ssl_auth.o ssl_auth.lo : config.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h linelist.h lp.h lpd_secure.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h +stty.o stty.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h stty.h utilities.h utilities.h +user_auth.o user_auth.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getqueue.h krb5_auth.h linelist.h linksupport.h lp.h lpd_dispatch.h lpd_secure.h md5.h permission.h plp_snprintf.h portable.h ssl_auth.h user_auth.h utilities.h utilities.h +utilities.o utilities.lo : config.h debug.h errorcodes.h errormsg.h getopt.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +vars.o vars.lo : config.h defs.h accounting.h child.h debug.h errormsg.h gethostinfo.h getqueue.h linelist.h lp.h permission.h plp_snprintf.h portable.h printjob.h utilities.h utilities.h +md5.o md5.lo : md5.h md5.h +lpr.o lpr.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpd_jobs.h lpr.h patchlevel.h plp_snprintf.h portable.h printjob.h sendjob.h utilities.h utilities.h +lpq.o lpq.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lpq.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h +lpc.o lpc.lo : config.h defs.h child.h control.h debug.h errorcodes.h errormsg.h getopt.h getprinter.h initialize.h linelist.h lp.h lpc.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h +lprm.o lprm.lo : config.h child.h debug.h errormsg.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lp.h lprm.h patchlevel.h plp_snprintf.h portable.h sendreq.h utilities.h utilities.h +lpd.o lpd.lo : config.h child.h debug.h errorcodes.h errormsg.h fileopen.h getopt.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd.h lpd_logger.h plp_snprintf.h portable.h proctitle.h utilities.h utilities.h +checkpc.o checkpc.lo : config.h defs.h checkpc.h child.h debug.h errormsg.h fileopen.h gethostinfo.h getopt.h getprinter.h getqueue.h initialize.h linelist.h linksupport.h lockfile.h lp.h lpd_remove.h patchlevel.h plp_snprintf.h portable.h proctitle.h stty.h utilities.h utilities.h +lpf.o lpf.lo : config.h portable.h portable.h +plp_snprintf.o plp_snprintf.lo : config.h config.h +monitor.o monitor.lo : config.h debug.h errormsg.h getopt.h getqueue.h linelist.h linksupport.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +getopt.o getopt.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +lpbanner.o lpbanner.lo : config.h debug.h errormsg.h linelist.h lp.h plp_snprintf.h portable.h utilities.h utilities.h +plp_snprintf.o plp_snprintf.lo : config.h config.h diff --git a/trunk/user/LPRng/src/common/accounting.c b/trunk/user/LPRng/src/src/common/accounting.c similarity index 100% rename from trunk/user/LPRng/src/common/accounting.c rename to trunk/user/LPRng/src/src/common/accounting.c diff --git a/trunk/user/LPRng/src/common/checkpc.c b/trunk/user/LPRng/src/src/common/checkpc.c similarity index 100% rename from trunk/user/LPRng/src/common/checkpc.c rename to trunk/user/LPRng/src/src/common/checkpc.c diff --git a/trunk/user/LPRng/src/common/child.c b/trunk/user/LPRng/src/src/common/child.c similarity index 100% rename from trunk/user/LPRng/src/common/child.c rename to trunk/user/LPRng/src/src/common/child.c diff --git a/trunk/user/LPRng/src/common/controlword.c b/trunk/user/LPRng/src/src/common/controlword.c similarity index 100% rename from trunk/user/LPRng/src/common/controlword.c rename to trunk/user/LPRng/src/src/common/controlword.c diff --git a/trunk/user/LPRng/src/common/copyright.c b/trunk/user/LPRng/src/src/common/copyright.c similarity index 100% rename from trunk/user/LPRng/src/common/copyright.c rename to trunk/user/LPRng/src/src/common/copyright.c diff --git a/trunk/user/LPRng/src/common/debug.c b/trunk/user/LPRng/src/src/common/debug.c similarity index 100% rename from trunk/user/LPRng/src/common/debug.c rename to trunk/user/LPRng/src/src/common/debug.c diff --git a/trunk/user/LPRng/src/common/errormsg.c b/trunk/user/LPRng/src/src/common/errormsg.c similarity index 100% rename from trunk/user/LPRng/src/common/errormsg.c rename to trunk/user/LPRng/src/src/common/errormsg.c diff --git a/trunk/user/LPRng/src/common/fileopen.c b/trunk/user/LPRng/src/src/common/fileopen.c similarity index 100% rename from trunk/user/LPRng/src/common/fileopen.c rename to trunk/user/LPRng/src/src/common/fileopen.c diff --git a/trunk/user/LPRng/src/common/gethostinfo.c b/trunk/user/LPRng/src/src/common/gethostinfo.c similarity index 100% rename from trunk/user/LPRng/src/common/gethostinfo.c rename to trunk/user/LPRng/src/src/common/gethostinfo.c diff --git a/trunk/user/LPRng/src/common/getopt.c b/trunk/user/LPRng/src/src/common/getopt.c similarity index 100% rename from trunk/user/LPRng/src/common/getopt.c rename to trunk/user/LPRng/src/src/common/getopt.c diff --git a/trunk/user/LPRng/src/common/getprinter.c b/trunk/user/LPRng/src/src/common/getprinter.c similarity index 100% rename from trunk/user/LPRng/src/common/getprinter.c rename to trunk/user/LPRng/src/src/common/getprinter.c diff --git a/trunk/user/LPRng/src/common/getqueue.c b/trunk/user/LPRng/src/src/common/getqueue.c similarity index 100% rename from trunk/user/LPRng/src/common/getqueue.c rename to trunk/user/LPRng/src/src/common/getqueue.c diff --git a/trunk/user/LPRng/src/common/globmatch.c b/trunk/user/LPRng/src/src/common/globmatch.c similarity index 100% rename from trunk/user/LPRng/src/common/globmatch.c rename to trunk/user/LPRng/src/src/common/globmatch.c diff --git a/trunk/user/LPRng/src/common/initialize.c b/trunk/user/LPRng/src/src/common/initialize.c similarity index 100% rename from trunk/user/LPRng/src/common/initialize.c rename to trunk/user/LPRng/src/src/common/initialize.c diff --git a/trunk/user/LPRng/src/common/krb5_auth.c b/trunk/user/LPRng/src/src/common/krb5_auth.c similarity index 100% rename from trunk/user/LPRng/src/common/krb5_auth.c rename to trunk/user/LPRng/src/src/common/krb5_auth.c diff --git a/trunk/user/LPRng/src/common/linelist.c b/trunk/user/LPRng/src/src/common/linelist.c similarity index 100% rename from trunk/user/LPRng/src/common/linelist.c rename to trunk/user/LPRng/src/src/common/linelist.c diff --git a/trunk/user/LPRng/src/common/linksupport.c b/trunk/user/LPRng/src/src/common/linksupport.c similarity index 100% rename from trunk/user/LPRng/src/common/linksupport.c rename to trunk/user/LPRng/src/src/common/linksupport.c diff --git a/trunk/user/LPRng/src/common/lockfile.c b/trunk/user/LPRng/src/src/common/lockfile.c similarity index 100% rename from trunk/user/LPRng/src/common/lockfile.c rename to trunk/user/LPRng/src/src/common/lockfile.c diff --git a/trunk/user/LPRng/src/common/lpbanner.c b/trunk/user/LPRng/src/src/common/lpbanner.c similarity index 100% rename from trunk/user/LPRng/src/common/lpbanner.c rename to trunk/user/LPRng/src/src/common/lpbanner.c diff --git a/trunk/user/LPRng/src/common/lpc.c b/trunk/user/LPRng/src/src/common/lpc.c similarity index 100% rename from trunk/user/LPRng/src/common/lpc.c rename to trunk/user/LPRng/src/src/common/lpc.c diff --git a/trunk/user/LPRng/src/common/lpd.c b/trunk/user/LPRng/src/src/common/lpd.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd.c rename to trunk/user/LPRng/src/src/common/lpd.c diff --git a/trunk/user/LPRng/src/common/lpd_control.c b/trunk/user/LPRng/src/src/common/lpd_control.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_control.c rename to trunk/user/LPRng/src/src/common/lpd_control.c diff --git a/trunk/user/LPRng/src/common/lpd_dispatch.c b/trunk/user/LPRng/src/src/common/lpd_dispatch.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_dispatch.c rename to trunk/user/LPRng/src/src/common/lpd_dispatch.c diff --git a/trunk/user/LPRng/src/common/lpd_jobs.c b/trunk/user/LPRng/src/src/common/lpd_jobs.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_jobs.c rename to trunk/user/LPRng/src/src/common/lpd_jobs.c diff --git a/trunk/user/LPRng/src/common/lpd_lisa.c b/trunk/user/LPRng/src/src/common/lpd_lisa.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_lisa.c rename to trunk/user/LPRng/src/src/common/lpd_lisa.c diff --git a/trunk/user/LPRng/src/common/lpd_logger.c b/trunk/user/LPRng/src/src/common/lpd_logger.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_logger.c rename to trunk/user/LPRng/src/src/common/lpd_logger.c diff --git a/trunk/user/LPRng/src/common/lpd_rcvjob.c b/trunk/user/LPRng/src/src/common/lpd_rcvjob.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_rcvjob.c rename to trunk/user/LPRng/src/src/common/lpd_rcvjob.c diff --git a/trunk/user/LPRng/src/common/lpd_remove.c b/trunk/user/LPRng/src/src/common/lpd_remove.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_remove.c rename to trunk/user/LPRng/src/src/common/lpd_remove.c diff --git a/trunk/user/LPRng/src/common/lpd_secure.c b/trunk/user/LPRng/src/src/common/lpd_secure.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_secure.c rename to trunk/user/LPRng/src/src/common/lpd_secure.c diff --git a/trunk/user/LPRng/src/common/lpd_status.c b/trunk/user/LPRng/src/src/common/lpd_status.c similarity index 100% rename from trunk/user/LPRng/src/common/lpd_status.c rename to trunk/user/LPRng/src/src/common/lpd_status.c diff --git a/trunk/user/LPRng/src/common/lpf.c b/trunk/user/LPRng/src/src/common/lpf.c similarity index 100% rename from trunk/user/LPRng/src/common/lpf.c rename to trunk/user/LPRng/src/src/common/lpf.c diff --git a/trunk/user/LPRng/src/common/lpq.c b/trunk/user/LPRng/src/src/common/lpq.c similarity index 100% rename from trunk/user/LPRng/src/common/lpq.c rename to trunk/user/LPRng/src/src/common/lpq.c diff --git a/trunk/user/LPRng/src/common/lpr.c b/trunk/user/LPRng/src/src/common/lpr.c similarity index 100% rename from trunk/user/LPRng/src/common/lpr.c rename to trunk/user/LPRng/src/src/common/lpr.c diff --git a/trunk/user/LPRng/src/common/lprm.c b/trunk/user/LPRng/src/src/common/lprm.c similarity index 100% rename from trunk/user/LPRng/src/common/lprm.c rename to trunk/user/LPRng/src/src/common/lprm.c diff --git a/trunk/user/LPRng/src/common/lpstat.c b/trunk/user/LPRng/src/src/common/lpstat.c similarity index 100% rename from trunk/user/LPRng/src/common/lpstat.c rename to trunk/user/LPRng/src/src/common/lpstat.c diff --git a/trunk/user/LPRng/src/common/md5.c b/trunk/user/LPRng/src/src/common/md5.c similarity index 100% rename from trunk/user/LPRng/src/common/md5.c rename to trunk/user/LPRng/src/src/common/md5.c diff --git a/trunk/user/LPRng/src/common/merge.c b/trunk/user/LPRng/src/src/common/merge.c similarity index 100% rename from trunk/user/LPRng/src/common/merge.c rename to trunk/user/LPRng/src/src/common/merge.c diff --git a/trunk/user/LPRng/src/common/monitor.c b/trunk/user/LPRng/src/src/common/monitor.c similarity index 100% rename from trunk/user/LPRng/src/common/monitor.c rename to trunk/user/LPRng/src/src/common/monitor.c diff --git a/trunk/user/LPRng/src/common/permission.c b/trunk/user/LPRng/src/src/common/permission.c similarity index 100% rename from trunk/user/LPRng/src/common/permission.c rename to trunk/user/LPRng/src/src/common/permission.c diff --git a/trunk/user/LPRng/src/common/plp_snprintf.c b/trunk/user/LPRng/src/src/common/plp_snprintf.c similarity index 100% rename from trunk/user/LPRng/src/common/plp_snprintf.c rename to trunk/user/LPRng/src/src/common/plp_snprintf.c diff --git a/trunk/user/LPRng/src/common/printjob.c b/trunk/user/LPRng/src/src/common/printjob.c similarity index 100% rename from trunk/user/LPRng/src/common/printjob.c rename to trunk/user/LPRng/src/src/common/printjob.c diff --git a/trunk/user/LPRng/src/common/proctitle.c b/trunk/user/LPRng/src/src/common/proctitle.c similarity index 100% rename from trunk/user/LPRng/src/common/proctitle.c rename to trunk/user/LPRng/src/src/common/proctitle.c diff --git a/trunk/user/LPRng/src/common/sendauth.c b/trunk/user/LPRng/src/src/common/sendauth.c similarity index 100% rename from trunk/user/LPRng/src/common/sendauth.c rename to trunk/user/LPRng/src/src/common/sendauth.c diff --git a/trunk/user/LPRng/src/common/sendjob.c b/trunk/user/LPRng/src/src/common/sendjob.c similarity index 100% rename from trunk/user/LPRng/src/common/sendjob.c rename to trunk/user/LPRng/src/src/common/sendjob.c diff --git a/trunk/user/LPRng/src/common/sendmail.c b/trunk/user/LPRng/src/src/common/sendmail.c similarity index 100% rename from trunk/user/LPRng/src/common/sendmail.c rename to trunk/user/LPRng/src/src/common/sendmail.c diff --git a/trunk/user/LPRng/src/common/sendreq.c b/trunk/user/LPRng/src/src/common/sendreq.c similarity index 100% rename from trunk/user/LPRng/src/common/sendreq.c rename to trunk/user/LPRng/src/src/common/sendreq.c diff --git a/trunk/user/LPRng/src/common/ssl_auth.c b/trunk/user/LPRng/src/src/common/ssl_auth.c similarity index 100% rename from trunk/user/LPRng/src/common/ssl_auth.c rename to trunk/user/LPRng/src/src/common/ssl_auth.c diff --git a/trunk/user/LPRng/src/common/stty.c b/trunk/user/LPRng/src/src/common/stty.c similarity index 100% rename from trunk/user/LPRng/src/common/stty.c rename to trunk/user/LPRng/src/src/common/stty.c diff --git a/trunk/user/LPRng/src/common/user_auth.c b/trunk/user/LPRng/src/src/common/user_auth.c similarity index 100% rename from trunk/user/LPRng/src/common/user_auth.c rename to trunk/user/LPRng/src/src/common/user_auth.c diff --git a/trunk/user/LPRng/src/common/user_objs.c b/trunk/user/LPRng/src/src/common/user_objs.c similarity index 100% rename from trunk/user/LPRng/src/common/user_objs.c rename to trunk/user/LPRng/src/src/common/user_objs.c diff --git a/trunk/user/LPRng/src/common/utilities.c b/trunk/user/LPRng/src/src/common/utilities.c similarity index 100% rename from trunk/user/LPRng/src/common/utilities.c rename to trunk/user/LPRng/src/src/common/utilities.c diff --git a/trunk/user/LPRng/src/common/vars.c b/trunk/user/LPRng/src/src/common/vars.c similarity index 100% rename from trunk/user/LPRng/src/common/vars.c rename to trunk/user/LPRng/src/src/common/vars.c diff --git a/trunk/user/LPRng/src/fixupdate b/trunk/user/LPRng/src/src/fixupdate similarity index 100% rename from trunk/user/LPRng/src/fixupdate rename to trunk/user/LPRng/src/src/fixupdate diff --git a/trunk/user/LPRng/src/freefs.c b/trunk/user/LPRng/src/src/freefs.c similarity index 100% rename from trunk/user/LPRng/src/freefs.c rename to trunk/user/LPRng/src/src/freefs.c diff --git a/trunk/user/LPRng/src/include/accounting.h b/trunk/user/LPRng/src/src/include/accounting.h similarity index 100% rename from trunk/user/LPRng/src/include/accounting.h rename to trunk/user/LPRng/src/src/include/accounting.h diff --git a/trunk/user/LPRng/src/include/checkpc.h b/trunk/user/LPRng/src/src/include/checkpc.h similarity index 100% rename from trunk/user/LPRng/src/include/checkpc.h rename to trunk/user/LPRng/src/src/include/checkpc.h diff --git a/trunk/user/LPRng/src/include/child.h b/trunk/user/LPRng/src/src/include/child.h similarity index 100% rename from trunk/user/LPRng/src/include/child.h rename to trunk/user/LPRng/src/src/include/child.h diff --git a/trunk/user/LPRng/src/include/control.h b/trunk/user/LPRng/src/src/include/control.h similarity index 100% rename from trunk/user/LPRng/src/include/control.h rename to trunk/user/LPRng/src/src/include/control.h diff --git a/trunk/user/LPRng/src/include/copyright.h b/trunk/user/LPRng/src/src/include/copyright.h similarity index 100% rename from trunk/user/LPRng/src/include/copyright.h rename to trunk/user/LPRng/src/src/include/copyright.h diff --git a/trunk/user/LPRng/src/include/debug.h b/trunk/user/LPRng/src/src/include/debug.h similarity index 100% rename from trunk/user/LPRng/src/include/debug.h rename to trunk/user/LPRng/src/src/include/debug.h diff --git a/trunk/user/LPRng/src/include/errorcodes.h b/trunk/user/LPRng/src/src/include/errorcodes.h similarity index 100% rename from trunk/user/LPRng/src/include/errorcodes.h rename to trunk/user/LPRng/src/src/include/errorcodes.h diff --git a/trunk/user/LPRng/src/include/errormsg.h b/trunk/user/LPRng/src/src/include/errormsg.h similarity index 100% rename from trunk/user/LPRng/src/include/errormsg.h rename to trunk/user/LPRng/src/src/include/errormsg.h diff --git a/trunk/user/LPRng/src/include/fileopen.h b/trunk/user/LPRng/src/src/include/fileopen.h similarity index 100% rename from trunk/user/LPRng/src/include/fileopen.h rename to trunk/user/LPRng/src/src/include/fileopen.h diff --git a/trunk/user/LPRng/src/include/gethostinfo.h b/trunk/user/LPRng/src/src/include/gethostinfo.h similarity index 100% rename from trunk/user/LPRng/src/include/gethostinfo.h rename to trunk/user/LPRng/src/src/include/gethostinfo.h diff --git a/trunk/user/LPRng/src/include/getopt.h b/trunk/user/LPRng/src/src/include/getopt.h similarity index 100% rename from trunk/user/LPRng/src/include/getopt.h rename to trunk/user/LPRng/src/src/include/getopt.h diff --git a/trunk/user/LPRng/src/include/getprinter.h b/trunk/user/LPRng/src/src/include/getprinter.h similarity index 100% rename from trunk/user/LPRng/src/include/getprinter.h rename to trunk/user/LPRng/src/src/include/getprinter.h diff --git a/trunk/user/LPRng/src/include/getqueue.h b/trunk/user/LPRng/src/src/include/getqueue.h similarity index 100% rename from trunk/user/LPRng/src/include/getqueue.h rename to trunk/user/LPRng/src/src/include/getqueue.h diff --git a/trunk/user/LPRng/src/include/globmatch.h b/trunk/user/LPRng/src/src/include/globmatch.h similarity index 100% rename from trunk/user/LPRng/src/include/globmatch.h rename to trunk/user/LPRng/src/src/include/globmatch.h diff --git a/trunk/user/LPRng/src/include/initialize.h b/trunk/user/LPRng/src/src/include/initialize.h similarity index 100% rename from trunk/user/LPRng/src/include/initialize.h rename to trunk/user/LPRng/src/src/include/initialize.h diff --git a/trunk/user/LPRng/src/include/krb5_auth.h b/trunk/user/LPRng/src/src/include/krb5_auth.h similarity index 100% rename from trunk/user/LPRng/src/include/krb5_auth.h rename to trunk/user/LPRng/src/src/include/krb5_auth.h diff --git a/trunk/user/LPRng/src/include/license.h b/trunk/user/LPRng/src/src/include/license.h similarity index 100% rename from trunk/user/LPRng/src/include/license.h rename to trunk/user/LPRng/src/src/include/license.h diff --git a/trunk/user/LPRng/src/include/linelist.h b/trunk/user/LPRng/src/src/include/linelist.h similarity index 100% rename from trunk/user/LPRng/src/include/linelist.h rename to trunk/user/LPRng/src/src/include/linelist.h diff --git a/trunk/user/LPRng/src/include/linksupport.h b/trunk/user/LPRng/src/src/include/linksupport.h similarity index 100% rename from trunk/user/LPRng/src/include/linksupport.h rename to trunk/user/LPRng/src/src/include/linksupport.h diff --git a/trunk/user/LPRng/src/include/lockfile.h b/trunk/user/LPRng/src/src/include/lockfile.h similarity index 100% rename from trunk/user/LPRng/src/include/lockfile.h rename to trunk/user/LPRng/src/src/include/lockfile.h diff --git a/trunk/user/LPRng/src/include/lp.h b/trunk/user/LPRng/src/src/include/lp.h similarity index 100% rename from trunk/user/LPRng/src/include/lp.h rename to trunk/user/LPRng/src/src/include/lp.h diff --git a/trunk/user/LPRng/src/include/lp_asus.h b/trunk/user/LPRng/src/src/include/lp_asus.h similarity index 100% rename from trunk/user/LPRng/src/include/lp_asus.h rename to trunk/user/LPRng/src/src/include/lp_asus.h diff --git a/trunk/user/LPRng/src/include/lpc.h b/trunk/user/LPRng/src/src/include/lpc.h similarity index 100% rename from trunk/user/LPRng/src/include/lpc.h rename to trunk/user/LPRng/src/src/include/lpc.h diff --git a/trunk/user/LPRng/src/include/lpd.h b/trunk/user/LPRng/src/src/include/lpd.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd.h rename to trunk/user/LPRng/src/src/include/lpd.h diff --git a/trunk/user/LPRng/src/include/lpd_control.h b/trunk/user/LPRng/src/src/include/lpd_control.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_control.h rename to trunk/user/LPRng/src/src/include/lpd_control.h diff --git a/trunk/user/LPRng/src/include/lpd_dispatch.h b/trunk/user/LPRng/src/src/include/lpd_dispatch.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_dispatch.h rename to trunk/user/LPRng/src/src/include/lpd_dispatch.h diff --git a/trunk/user/LPRng/src/include/lpd_jobs.h b/trunk/user/LPRng/src/src/include/lpd_jobs.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_jobs.h rename to trunk/user/LPRng/src/src/include/lpd_jobs.h diff --git a/trunk/user/LPRng/src/include/lpd_logger.h b/trunk/user/LPRng/src/src/include/lpd_logger.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_logger.h rename to trunk/user/LPRng/src/src/include/lpd_logger.h diff --git a/trunk/user/LPRng/src/include/lpd_rcvjob.h b/trunk/user/LPRng/src/src/include/lpd_rcvjob.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_rcvjob.h rename to trunk/user/LPRng/src/src/include/lpd_rcvjob.h diff --git a/trunk/user/LPRng/src/include/lpd_remove.h b/trunk/user/LPRng/src/src/include/lpd_remove.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_remove.h rename to trunk/user/LPRng/src/src/include/lpd_remove.h diff --git a/trunk/user/LPRng/src/include/lpd_secure.h b/trunk/user/LPRng/src/src/include/lpd_secure.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_secure.h rename to trunk/user/LPRng/src/src/include/lpd_secure.h diff --git a/trunk/user/LPRng/src/include/lpd_status.h b/trunk/user/LPRng/src/src/include/lpd_status.h similarity index 100% rename from trunk/user/LPRng/src/include/lpd_status.h rename to trunk/user/LPRng/src/src/include/lpd_status.h diff --git a/trunk/user/LPRng/src/include/lpq.h b/trunk/user/LPRng/src/src/include/lpq.h similarity index 100% rename from trunk/user/LPRng/src/include/lpq.h rename to trunk/user/LPRng/src/src/include/lpq.h diff --git a/trunk/user/LPRng/src/include/lpr.h b/trunk/user/LPRng/src/src/include/lpr.h similarity index 100% rename from trunk/user/LPRng/src/include/lpr.h rename to trunk/user/LPRng/src/src/include/lpr.h diff --git a/trunk/user/LPRng/src/include/lprm.h b/trunk/user/LPRng/src/src/include/lprm.h similarity index 100% rename from trunk/user/LPRng/src/include/lprm.h rename to trunk/user/LPRng/src/src/include/lprm.h diff --git a/trunk/user/LPRng/src/include/lpstat.h b/trunk/user/LPRng/src/src/include/lpstat.h similarity index 100% rename from trunk/user/LPRng/src/include/lpstat.h rename to trunk/user/LPRng/src/src/include/lpstat.h diff --git a/trunk/user/LPRng/src/include/md5.h b/trunk/user/LPRng/src/src/include/md5.h similarity index 100% rename from trunk/user/LPRng/src/include/md5.h rename to trunk/user/LPRng/src/src/include/md5.h diff --git a/trunk/user/LPRng/src/include/merge.h b/trunk/user/LPRng/src/src/include/merge.h similarity index 100% rename from trunk/user/LPRng/src/include/merge.h rename to trunk/user/LPRng/src/src/include/merge.h diff --git a/trunk/user/LPRng/src/include/patchlevel.h b/trunk/user/LPRng/src/src/include/patchlevel.h similarity index 100% rename from trunk/user/LPRng/src/include/patchlevel.h rename to trunk/user/LPRng/src/src/include/patchlevel.h diff --git a/trunk/user/LPRng/src/include/permission.h b/trunk/user/LPRng/src/src/include/permission.h similarity index 100% rename from trunk/user/LPRng/src/include/permission.h rename to trunk/user/LPRng/src/src/include/permission.h diff --git a/trunk/user/LPRng/src/include/plp_snprintf.h b/trunk/user/LPRng/src/src/include/plp_snprintf.h similarity index 100% rename from trunk/user/LPRng/src/include/plp_snprintf.h rename to trunk/user/LPRng/src/src/include/plp_snprintf.h diff --git a/trunk/user/LPRng/src/include/portable.h b/trunk/user/LPRng/src/src/include/portable.h similarity index 100% rename from trunk/user/LPRng/src/include/portable.h rename to trunk/user/LPRng/src/src/include/portable.h diff --git a/trunk/user/LPRng/src/include/printjob.h b/trunk/user/LPRng/src/src/include/printjob.h similarity index 100% rename from trunk/user/LPRng/src/include/printjob.h rename to trunk/user/LPRng/src/src/include/printjob.h diff --git a/trunk/user/LPRng/src/include/proctitle.h b/trunk/user/LPRng/src/src/include/proctitle.h similarity index 100% rename from trunk/user/LPRng/src/include/proctitle.h rename to trunk/user/LPRng/src/src/include/proctitle.h diff --git a/trunk/user/LPRng/src/include/readstatus.h b/trunk/user/LPRng/src/src/include/readstatus.h similarity index 100% rename from trunk/user/LPRng/src/include/readstatus.h rename to trunk/user/LPRng/src/src/include/readstatus.h diff --git a/trunk/user/LPRng/src/include/sendauth.h b/trunk/user/LPRng/src/src/include/sendauth.h similarity index 100% rename from trunk/user/LPRng/src/include/sendauth.h rename to trunk/user/LPRng/src/src/include/sendauth.h diff --git a/trunk/user/LPRng/src/include/sendjob.h b/trunk/user/LPRng/src/src/include/sendjob.h similarity index 100% rename from trunk/user/LPRng/src/include/sendjob.h rename to trunk/user/LPRng/src/src/include/sendjob.h diff --git a/trunk/user/LPRng/src/include/sendmail.h b/trunk/user/LPRng/src/src/include/sendmail.h similarity index 100% rename from trunk/user/LPRng/src/include/sendmail.h rename to trunk/user/LPRng/src/src/include/sendmail.h diff --git a/trunk/user/LPRng/src/include/sendreq.h b/trunk/user/LPRng/src/src/include/sendreq.h similarity index 100% rename from trunk/user/LPRng/src/include/sendreq.h rename to trunk/user/LPRng/src/src/include/sendreq.h diff --git a/trunk/user/LPRng/src/include/ssl_auth.h b/trunk/user/LPRng/src/src/include/ssl_auth.h similarity index 100% rename from trunk/user/LPRng/src/include/ssl_auth.h rename to trunk/user/LPRng/src/src/include/ssl_auth.h diff --git a/trunk/user/LPRng/src/include/stty.h b/trunk/user/LPRng/src/src/include/stty.h similarity index 100% rename from trunk/user/LPRng/src/include/stty.h rename to trunk/user/LPRng/src/src/include/stty.h diff --git a/trunk/user/LPRng/src/include/user_auth.h b/trunk/user/LPRng/src/src/include/user_auth.h similarity index 100% rename from trunk/user/LPRng/src/include/user_auth.h rename to trunk/user/LPRng/src/src/include/user_auth.h diff --git a/trunk/user/LPRng/src/include/user_objs.h b/trunk/user/LPRng/src/src/include/user_objs.h similarity index 100% rename from trunk/user/LPRng/src/include/user_objs.h rename to trunk/user/LPRng/src/src/include/user_objs.h diff --git a/trunk/user/LPRng/src/include/utilities.h b/trunk/user/LPRng/src/src/include/utilities.h similarity index 100% rename from trunk/user/LPRng/src/include/utilities.h rename to trunk/user/LPRng/src/src/include/utilities.h diff --git a/trunk/user/LPRng/src/include/wlancom.h b/trunk/user/LPRng/src/src/include/wlancom.h similarity index 100% rename from trunk/user/LPRng/src/include/wlancom.h rename to trunk/user/LPRng/src/src/include/wlancom.h diff --git a/trunk/user/LPRng/man/install-sh b/trunk/user/LPRng/src/src/install-sh similarity index 100% rename from trunk/user/LPRng/man/install-sh rename to trunk/user/LPRng/src/src/install-sh diff --git a/trunk/user/LPRng/src/lprng_certs.sh b/trunk/user/LPRng/src/src/lprng_certs.sh similarity index 100% rename from trunk/user/LPRng/src/lprng_certs.sh rename to trunk/user/LPRng/src/src/lprng_certs.sh diff --git a/trunk/user/LPRng/src/lprng_index_certs.sh b/trunk/user/LPRng/src/src/lprng_index_certs.sh similarity index 100% rename from trunk/user/LPRng/src/lprng_index_certs.sh rename to trunk/user/LPRng/src/src/lprng_index_certs.sh diff --git a/trunk/user/LPRng/src/src/mkinstalldirs b/trunk/user/LPRng/src/src/mkinstalldirs new file mode 100644 index 00000000000..b75fa333dc6 --- /dev/null +++ b/trunk/user/LPRng/src/src/mkinstalldirs @@ -0,0 +1,74 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy +# Author: Noah Friedman +# Created: 1993-05-16 +# Public domain + +# mkinstalldirs,v 1.1 2001/08/21 20:33:17 root Exp + +errstatus=0 +dirmode="" + +usage="\ +Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." + +# process command line arguments +while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) # -h for help + echo "${usage}" 1>&2; exit 0 ;; + -m ) # -m PERM arg + shift + test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } + dirmode="${1}" + shift ;; + -- ) shift; break ;; # stop option processing + -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option + * ) break ;; # first non-opt arg + esac +done + +for file +do + set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` + shift + + pathcomp= + for d + do + pathcomp="$pathcomp$d" + case "$pathcomp" in + -* ) pathcomp=./$pathcomp ;; + esac + + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + else + if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" + + lasterr="" + chmod $dirmode "$pathcomp" || lasterr=$? + + if test ! -z "$lasterr"; then + errstatus=$lasterr + fi + fi + fi + fi + + pathcomp="$pathcomp/" + done +done + +exit $errstatus + +# Local Variables: +# mode:shell-script +# sh-indentation:3 +# End: diff --git a/trunk/user/LPRng/src/pclbanner b/trunk/user/LPRng/src/src/pclbanner similarity index 100% rename from trunk/user/LPRng/src/pclbanner rename to trunk/user/LPRng/src/src/pclbanner diff --git a/trunk/user/LPRng/src/pclbanner.in b/trunk/user/LPRng/src/src/pclbanner.in similarity index 100% rename from trunk/user/LPRng/src/pclbanner.in rename to trunk/user/LPRng/src/src/pclbanner.in diff --git a/trunk/user/LPRng/src/psbanner b/trunk/user/LPRng/src/src/psbanner similarity index 100% rename from trunk/user/LPRng/src/psbanner rename to trunk/user/LPRng/src/src/psbanner diff --git a/trunk/user/LPRng/src/psbanner.in b/trunk/user/LPRng/src/src/psbanner.in similarity index 100% rename from trunk/user/LPRng/src/psbanner.in rename to trunk/user/LPRng/src/src/psbanner.in diff --git a/trunk/user/LPRng/working_binaries/lpd b/trunk/user/LPRng/src/working_binaries/lpd similarity index 100% rename from trunk/user/LPRng/working_binaries/lpd rename to trunk/user/LPRng/src/working_binaries/lpd diff --git a/trunk/user/LPRng/working_binaries/lpd_usbonly b/trunk/user/LPRng/src/working_binaries/lpd_usbonly similarity index 100% rename from trunk/user/LPRng/working_binaries/lpd_usbonly rename to trunk/user/LPRng/src/working_binaries/lpd_usbonly diff --git a/trunk/user/LPRng/working_binaries/printer.c b/trunk/user/LPRng/src/working_binaries/printer.c similarity index 100% rename from trunk/user/LPRng/working_binaries/printer.c rename to trunk/user/LPRng/src/working_binaries/printer.c diff --git a/trunk/user/LPRng/working_binaries/printer.o.rename b/trunk/user/LPRng/src/working_binaries/printer.o.rename similarity index 100% rename from trunk/user/LPRng/working_binaries/printer.o.rename rename to trunk/user/LPRng/src/working_binaries/printer.o.rename diff --git a/trunk/user/Makefile b/trunk/user/Makefile index a372057b98a..b8b00f48a5e 100644 --- a/trunk/user/Makefile +++ b/trunk/user/Makefile @@ -16,6 +16,9 @@ include $(ARCH_CONFIG) INSTALLDIR = $(ROOTDIR)/romfs +BOARD_CONFIG = $(ROOTDIR)/user/boards.mk +CFLAGS_CONFIG = $(ROOTDIR)/user/cflags.mk + FS_EXT_ENABLED=n FS_FAT_ENABLED=n FS_NTFS_ENABLED=n diff --git a/trunk/user/shared/boards.mk b/trunk/user/boards.mk similarity index 96% rename from trunk/user/shared/boards.mk rename to trunk/user/boards.mk index ef2f5fb8419..7509df5f7e6 100644 --- a/trunk/user/shared/boards.mk +++ b/trunk/user/boards.mk @@ -4,7 +4,7 @@ BOARD_NUM_USB_PORTS=0 -include $(ROOTDIR)/user/shared/board.mk +include $(ROOTDIR)/user/board.mk ################################################################## diff --git a/trunk/user/shared/cflags.mk b/trunk/user/cflags.mk similarity index 100% rename from trunk/user/shared/cflags.mk rename to trunk/user/cflags.mk diff --git a/trunk/user/httpd/Makefile b/trunk/user/httpd/Makefile index 5f87e2fe79b..4a1ab4cf31b 100644 --- a/trunk/user/httpd/Makefile +++ b/trunk/user/httpd/Makefile @@ -1,62 +1,20 @@ -ifndef ROOTDIR -ROOTDIR=../.. -endif +include $(ROOTDIR)/rules.mk -USERDIR = $(ROOTDIR)/user -SHDIR = $(ROOTDIR)/user/shared +PKG_NAME:=httpd -include $(SHDIR)/boards.mk -include $(SHDIR)/cflags.mk +include $(INCLUDE_DIR)/package.mk -CFLAGS += -Wall -I. -I$(SHDIR) -I$(SHDIR)/include +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/include/shared \ + $(if $(STORAGE_ENABLED),-I$(STAGING_DIR)/include/libdisk,) +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -LDFLAGS += -L. -lm -LDFLAGS += -L$(SHDIR) -lshared -LDFLAGS += -liw -ifeq ($(STORAGE_ENABLED),y) -CFLAGS += -I$(USERDIR)/libdisk -LDFLAGS += -L$(USERDIR)/libdisk -ldisk -endif -ifeq ($(CONFIG_FIRMWARE_INCLUDE_HTTPS),y) -LDFLAGS += -L$(STAGEDIR)/lib -lssl -lcrypto -endif - -EXEC = httpd -OBJS = httpd.o ej.o cgi.o web_ex.o common.o nvram_x.o ralink.o crc32.o base64.o aspbw.o initial_web_hook.o variables.o -OBJS += tdate_parse.o upload.o -ifeq ($(CONFIG_FIRMWARE_INCLUDE_HTTPS),y) -OBJS += https.o -endif -ifeq ($(STORAGE_ENABLED),y) -OBJS += aidisk.o -endif -ifdef CONFIG_RTL8367 -OBJS += switch_rtl8367.o -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/rtl8367 -else -ifdef CONFIG_RAETH -OBJS += switch_mtk_esw.o -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/ethernet/raeth -else -ifdef CONFIG_RAETH_ESW -OBJS += switch_mtk_esw.o -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/raeth -endif -endif -endif -OBJS += dbapi.o -all: $(OBJS) Makefile - $(CC) -o $(EXEC) $(OBJS) $(LDFLAGS) - $(STRIP) $(EXEC) - -c.o: - $(CC) -c $*.c $(CFLAGS) - -clean: - rm -f *.o *~ httpd +$(eval $(call BuildPackage,httpd)) romfs: - $(ROMFSINST) /usr/sbin/httpd + $(INSTALL_DIR) $(ROMFSDIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/httpd $(ROMFSDIR)/usr/sbin/httpd ifeq ($(CONFIG_FIRMWARE_INCLUDE_HTTPS),y) - $(ROMFSINST) /usr/bin/https-cert.sh -endif + $(INSTALL_DIR) $(ROMFSDIR)/usr/bin + $(INSTALL_BIN) ./https-cert.sh $(ROMFSDIR)/usr/bin/https-cert.sh +endif \ No newline at end of file diff --git a/trunk/user/httpd/src/Makefile b/trunk/user/httpd/src/Makefile new file mode 100644 index 00000000000..58f761e1125 --- /dev/null +++ b/trunk/user/httpd/src/Makefile @@ -0,0 +1,58 @@ +ifndef ROOTDIR +ROOTDIR=../.. +endif + +include $(BOARD_CONFIG) +include $(CFLAGS_CONFIG) + +CFLAGS += -I. + +LDFLAGS += -L. -lm +LDFLAGS += -lshared +LDFLAGS += -liw +ifeq ($(STORAGE_ENABLED),y) +LDFLAGS += -ldisk +endif +ifeq ($(CONFIG_FIRMWARE_INCLUDE_HTTPS),y) +LDFLAGS += -lssl -lcrypto +endif + +EXEC = httpd +OBJS = httpd.o ej.o cgi.o web_ex.o common.o nvram_x.o ralink.o crc32.o base64.o aspbw.o initial_web_hook.o variables.o +OBJS += tdate_parse.o upload.o +ifeq ($(CONFIG_FIRMWARE_INCLUDE_HTTPS),y) +OBJS += https.o +endif +ifeq ($(STORAGE_ENABLED),y) +OBJS += aidisk.o +endif +ifdef CONFIG_RTL8367 +OBJS += switch_rtl8367.o +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/rtl8367 +else +ifdef CONFIG_RAETH +OBJS += switch_mtk_esw.o +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/ethernet/raeth +else +ifdef CONFIG_RAETH_ESW +OBJS += switch_mtk_esw.o +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/raeth +endif +endif +endif +OBJS += dbapi.o +all: $(OBJS) Makefile + $(CC) -o $(EXEC) $(OBJS) $(LDFLAGS) + $(STRIP) $(EXEC) + +c.o: + $(CC) -c $*.c $(CFLAGS) + +clean: + rm -f *.o *~ httpd + +romfs: + $(ROMFSINST) /usr/sbin/httpd +ifeq ($(CONFIG_FIRMWARE_INCLUDE_HTTPS),y) + $(ROMFSINST) /usr/bin/https-cert.sh +endif diff --git a/trunk/user/httpd/aidisk.c b/trunk/user/httpd/src/aidisk.c similarity index 100% rename from trunk/user/httpd/aidisk.c rename to trunk/user/httpd/src/aidisk.c diff --git a/trunk/user/httpd/aspbw.c b/trunk/user/httpd/src/aspbw.c similarity index 100% rename from trunk/user/httpd/aspbw.c rename to trunk/user/httpd/src/aspbw.c diff --git a/trunk/user/httpd/base64.c b/trunk/user/httpd/src/base64.c similarity index 100% rename from trunk/user/httpd/base64.c rename to trunk/user/httpd/src/base64.c diff --git a/trunk/user/httpd/cgi.c b/trunk/user/httpd/src/cgi.c similarity index 100% rename from trunk/user/httpd/cgi.c rename to trunk/user/httpd/src/cgi.c diff --git a/trunk/user/httpd/common.c b/trunk/user/httpd/src/common.c similarity index 100% rename from trunk/user/httpd/common.c rename to trunk/user/httpd/src/common.c diff --git a/trunk/user/httpd/common.h b/trunk/user/httpd/src/common.h similarity index 100% rename from trunk/user/httpd/common.h rename to trunk/user/httpd/src/common.h diff --git a/trunk/user/httpd/crc32.c b/trunk/user/httpd/src/crc32.c similarity index 100% rename from trunk/user/httpd/crc32.c rename to trunk/user/httpd/src/crc32.c diff --git a/trunk/user/httpd/dbapi.c b/trunk/user/httpd/src/dbapi.c similarity index 100% rename from trunk/user/httpd/dbapi.c rename to trunk/user/httpd/src/dbapi.c diff --git a/trunk/user/httpd/dbapi.h b/trunk/user/httpd/src/dbapi.h similarity index 100% rename from trunk/user/httpd/dbapi.h rename to trunk/user/httpd/src/dbapi.h diff --git a/trunk/user/httpd/ej.c b/trunk/user/httpd/src/ej.c similarity index 100% rename from trunk/user/httpd/ej.c rename to trunk/user/httpd/src/ej.c diff --git a/trunk/user/httpd/httpd.c b/trunk/user/httpd/src/httpd.c similarity index 100% rename from trunk/user/httpd/httpd.c rename to trunk/user/httpd/src/httpd.c diff --git a/trunk/user/httpd/httpd.h b/trunk/user/httpd/src/httpd.h similarity index 100% rename from trunk/user/httpd/httpd.h rename to trunk/user/httpd/src/httpd.h diff --git a/trunk/user/httpd/https.c b/trunk/user/httpd/src/https.c similarity index 100% rename from trunk/user/httpd/https.c rename to trunk/user/httpd/src/https.c diff --git a/trunk/user/httpd/image.h b/trunk/user/httpd/src/image.h similarity index 100% rename from trunk/user/httpd/image.h rename to trunk/user/httpd/src/image.h diff --git a/trunk/user/httpd/initial_web_hook.c b/trunk/user/httpd/src/initial_web_hook.c similarity index 100% rename from trunk/user/httpd/initial_web_hook.c rename to trunk/user/httpd/src/initial_web_hook.c diff --git a/trunk/user/httpd/nvram_x.c b/trunk/user/httpd/src/nvram_x.c similarity index 100% rename from trunk/user/httpd/nvram_x.c rename to trunk/user/httpd/src/nvram_x.c diff --git a/trunk/user/httpd/nvram_x.h b/trunk/user/httpd/src/nvram_x.h similarity index 100% rename from trunk/user/httpd/nvram_x.h rename to trunk/user/httpd/src/nvram_x.h diff --git a/trunk/user/httpd/ralink.c b/trunk/user/httpd/src/ralink.c similarity index 100% rename from trunk/user/httpd/ralink.c rename to trunk/user/httpd/src/ralink.c diff --git a/trunk/user/httpd/switch_mtk_esw.c b/trunk/user/httpd/src/switch_mtk_esw.c similarity index 100% rename from trunk/user/httpd/switch_mtk_esw.c rename to trunk/user/httpd/src/switch_mtk_esw.c diff --git a/trunk/user/httpd/switch_rtl8367.c b/trunk/user/httpd/src/switch_rtl8367.c similarity index 100% rename from trunk/user/httpd/switch_rtl8367.c rename to trunk/user/httpd/src/switch_rtl8367.c diff --git a/trunk/user/httpd/tdate_parse.c b/trunk/user/httpd/src/tdate_parse.c similarity index 100% rename from trunk/user/httpd/tdate_parse.c rename to trunk/user/httpd/src/tdate_parse.c diff --git a/trunk/user/httpd/upload.c b/trunk/user/httpd/src/upload.c similarity index 100% rename from trunk/user/httpd/upload.c rename to trunk/user/httpd/src/upload.c diff --git a/trunk/user/httpd/variables.c b/trunk/user/httpd/src/variables.c similarity index 100% rename from trunk/user/httpd/variables.c rename to trunk/user/httpd/src/variables.c diff --git a/trunk/user/httpd/web_ex.c b/trunk/user/httpd/src/web_ex.c similarity index 100% rename from trunk/user/httpd/web_ex.c rename to trunk/user/httpd/src/web_ex.c diff --git a/trunk/user/infosvr/Makefile b/trunk/user/infosvr/Makefile index f5c0fea7ea5..6fc3940b770 100644 --- a/trunk/user/infosvr/Makefile +++ b/trunk/user/infosvr/Makefile @@ -1,22 +1,14 @@ -USERDIR = $(ROOTDIR)/user +include $(ROOTDIR)/rules.mk -CFLAGS += -I. -I$(USERDIR)/shared -I$(USERDIR)/shared/include -LDFLAGS = -L$(USERDIR)/shared -lshared +PKG_NAME:=infosvr -OBJS=infosvr.o asus.o +include $(INCLUDE_DIR)/package.mk -all: infosvr +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -%.o: %.c - $(CC) $(CFLAGS) -c $< - -infosvr: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o infosvr $(LIBS) - $(STRIP) $@ +$(eval $(call BuildPackage,infosvr)) romfs: - $(ROMFSINST) /usr/sbin/infosvr - -clean: - rm -f *.o *~ infosvr - + $(INSTALL_DIR) $(ROMFSDIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/infosvr $(ROMFSDIR)/usr/sbin/infosvr diff --git a/trunk/user/infosvr/src/Makefile b/trunk/user/infosvr/src/Makefile new file mode 100644 index 00000000000..40032ee80bc --- /dev/null +++ b/trunk/user/infosvr/src/Makefile @@ -0,0 +1,19 @@ +USERDIR = $(ROOTDIR)/user + +CFLAGS += -I. +LDFLAGS += -lshared + +OBJS=infosvr.o asus.o + +all: infosvr + +%.o: %.c + $(CC) $(CFLAGS) -c $< + +infosvr: $(OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o infosvr $(LIBS) + $(STRIP) $@ + +clean: + rm -f *.o *~ infosvr + diff --git a/trunk/user/infosvr/asus.c b/trunk/user/infosvr/src/asus.c similarity index 98% rename from trunk/user/infosvr/asus.c rename to trunk/user/infosvr/src/asus.c index c7f998e95b3..7768894687e 100644 --- a/trunk/user/infosvr/asus.c +++ b/trunk/user/infosvr/src/asus.c @@ -26,7 +26,7 @@ #include #include "infosvr.h" -#include +#include #include #include diff --git a/trunk/user/infosvr/infosvr.c b/trunk/user/infosvr/src/infosvr.c similarity index 99% rename from trunk/user/infosvr/infosvr.c rename to trunk/user/infosvr/src/infosvr.c index 712a14adf6a..33cb3eb2134 100644 --- a/trunk/user/infosvr/infosvr.c +++ b/trunk/user/infosvr/src/infosvr.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "infosvr.h" #define SRV_ADDR INADDR_ANY diff --git a/trunk/user/infosvr/infosvr.h b/trunk/user/infosvr/src/infosvr.h similarity index 100% rename from trunk/user/infosvr/infosvr.h rename to trunk/user/infosvr/src/infosvr.h diff --git a/trunk/user/libdisk/Makefile b/trunk/user/libdisk/Makefile index d8eb829e27d..a02c8c5a20d 100644 --- a/trunk/user/libdisk/Makefile +++ b/trunk/user/libdisk/Makefile @@ -1,36 +1,19 @@ -ifndef ROOTDIR -ROOTDIR=../.. -endif - -USERDIR = $(ROOTDIR)/user -SHDIR = $(ROOTDIR)/user/shared - -include $(SHDIR)/boards.mk -include $(SHDIR)/cflags.mk - -CFLAGS += -fPIC -CFLAGS += -I. -I$(SHDIR) -I$(SHDIR)/include +include $(ROOTDIR)/rules.mk -LDFLAGS = -L$(SHDIR) -lshared +PKG_NAME:=libdisk +PKG_INSTALL:=1 -OBJS = dev_info.o disk_io_tools.o disk_initial.o disk_share.o -ifdef CONFIG_USB_SUPPORT -OBJS += usb_info.o -endif - -all: libdisk.so test_share +include $(INCLUDE_DIR)/package.mk -libdisk.so: $(OBJS) $(SHDIR)/shutils.o - $(LD) -shared -o $@ $^ +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -test_share: test_share.o libdisk.so - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ +$(eval $(call BuildPackage,libdisk)) romfs: - $(ROMFSINST) /lib/libdisk.so - if [ "$(CONFIG_FIRMWARE_INCLUDE_SMBD)" = "y" ] || [ "$(CONFIG_FIRMWARE_INCLUDE_FTPD)" = "y" ] ; then \ - $(ROMFSINST) /sbin/test_share ; \ - fi; - -clean: - rm -f *.o libdisk.so test_share + $(INSTALL_DIR) $(ROMFSDIR)/lib + $(CP) $(PKG_BUILD_DIR)/libdisk.so $(ROMFSDIR)/lib/ +ifneq ($(filter y,$(CONFIG_FIRMWARE_INCLUDE_SMBD) $(CONFIG_FIRMWARE_INCLUDE_FTPD)),) + $(INSTALL_DIR) $(ROMFSDIR)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/test_share $(ROMFSDIR)/sbin/test_share +endif diff --git a/trunk/user/libdisk/src/Makefile b/trunk/user/libdisk/src/Makefile new file mode 100644 index 00000000000..fdc4e0c97e1 --- /dev/null +++ b/trunk/user/libdisk/src/Makefile @@ -0,0 +1,32 @@ +DESTDIR = /usr +INSTALL = install + +include $(BOARD_CONFIG) +include $(CFLAGS_CONFIG) + +CFLAGS += -fPIC +LDFLAGS += -lshared + +OBJS = dev_info.o disk_io_tools.o disk_initial.o disk_share.o +ifdef CONFIG_USB_SUPPORT +OBJS += usb_info.o +endif + +HEADERS := $(shell ls *.h) + +all: libdisk.so test_share + +libdisk.so: $(OBJS) + $(LD) $(LDFLAGS) -shared -o $@ $^ + +test_share: test_share.o libdisk.so + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + +install: + $(INSTALL) -d $(DESTDIR)/lib + $(INSTALL) -m 755 libdisk.so $(DESTDIR)/lib + $(INSTALL) -d $(DESTDIR)/include/libdisk + $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)/include/libdisk + +clean: + rm -f *.o libdisk.so test_share diff --git a/trunk/user/libdisk/dev_info.c b/trunk/user/libdisk/src/dev_info.c similarity index 100% rename from trunk/user/libdisk/dev_info.c rename to trunk/user/libdisk/src/dev_info.c diff --git a/trunk/user/libdisk/dev_info.h b/trunk/user/libdisk/src/dev_info.h similarity index 100% rename from trunk/user/libdisk/dev_info.h rename to trunk/user/libdisk/src/dev_info.h diff --git a/trunk/user/libdisk/disk_initial.c b/trunk/user/libdisk/src/disk_initial.c similarity index 99% rename from trunk/user/libdisk/disk_initial.c rename to trunk/user/libdisk/src/disk_initial.c index 2bdd2af1fb0..35858f5ce46 100644 --- a/trunk/user/libdisk/disk_initial.c +++ b/trunk/user/libdisk/src/disk_initial.c @@ -460,7 +460,7 @@ is_usb_storage_mounted(void) ret = 0; while (fgets(line, sizeof(line), fp)) { if (strncmp(line, "/dev/sd", 7) == 0) { -#if 1 +#if defined(CONFIG_USB_SUPPORT) int port_num = get_usb_root_port_by_sd_device(line+5); switch (port_num) { diff --git a/trunk/user/libdisk/disk_initial.h b/trunk/user/libdisk/src/disk_initial.h similarity index 100% rename from trunk/user/libdisk/disk_initial.h rename to trunk/user/libdisk/src/disk_initial.h diff --git a/trunk/user/libdisk/disk_io_tools.c b/trunk/user/libdisk/src/disk_io_tools.c similarity index 100% rename from trunk/user/libdisk/disk_io_tools.c rename to trunk/user/libdisk/src/disk_io_tools.c diff --git a/trunk/user/libdisk/disk_io_tools.h b/trunk/user/libdisk/src/disk_io_tools.h similarity index 100% rename from trunk/user/libdisk/disk_io_tools.h rename to trunk/user/libdisk/src/disk_io_tools.h diff --git a/trunk/user/libdisk/disk_share.c b/trunk/user/libdisk/src/disk_share.c similarity index 100% rename from trunk/user/libdisk/disk_share.c rename to trunk/user/libdisk/src/disk_share.c diff --git a/trunk/user/libdisk/disk_share.h b/trunk/user/libdisk/src/disk_share.h similarity index 100% rename from trunk/user/libdisk/disk_share.h rename to trunk/user/libdisk/src/disk_share.h diff --git a/trunk/user/libdisk/disk_test.c b/trunk/user/libdisk/src/disk_test.c similarity index 100% rename from trunk/user/libdisk/disk_test.c rename to trunk/user/libdisk/src/disk_test.c diff --git a/trunk/user/libdisk/test_share.c b/trunk/user/libdisk/src/test_share.c similarity index 100% rename from trunk/user/libdisk/test_share.c rename to trunk/user/libdisk/src/test_share.c diff --git a/trunk/user/libdisk/usb_info.c b/trunk/user/libdisk/src/usb_info.c similarity index 99% rename from trunk/user/libdisk/usb_info.c rename to trunk/user/libdisk/src/usb_info.c index 5a80ecc7e1a..b8b9730bee1 100644 --- a/trunk/user/libdisk/usb_info.c +++ b/trunk/user/libdisk/src/usb_info.c @@ -425,7 +425,7 @@ int has_usb_devices(void) continue; id_parent = get_param_int(line, "Prnt=", 10, -1); -#if 1 +#if defined(CONFIG_USB_SUPPORT) if (id_parent == 1) { int id_port = get_param_int(line, "Port=", 10, 0); #if BOARD_USB_PORT_SWAP diff --git a/trunk/user/libdisk/usb_info.h b/trunk/user/libdisk/src/usb_info.h similarity index 100% rename from trunk/user/libdisk/usb_info.h rename to trunk/user/libdisk/src/usb_info.h diff --git a/trunk/user/lldt/Makefile b/trunk/user/lldt/Makefile index 47db6e18e3b..83cad392b69 100644 --- a/trunk/user/lldt/Makefile +++ b/trunk/user/lldt/Makefile @@ -1,24 +1,20 @@ -VPATH = src -CFLAGS += -Os -pipe -Wall -Wno-unused -OS_LAYER = osl-linux.c +include $(ROOTDIR)/rules.mk -SHDIR = $(ROOTDIR)/user/shared -USERDIR = $(ROOTDIR)/user -CFLAGS += -I. -I$(SHDIR) -I$(SHDIR)/include -CFLAGS += $(if $(CONFIG_IPV6),-DUSE_IPV6,) -CFLAGS += -ffunction-sections -fdata-sections +PKG_NAME:=lldt -LDFLAGS += -L$(SHDIR) -lshared -LDFLAGS += -Wl,--gc-sections +include $(INCLUDE_DIR)/package.mk -all: lld2d +TARGET_CFLAGS += \ + $(if $(CONFIG_IPV6),-DUSE_IPV6,) \ + -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -include src/common.mk +$(eval $(call BuildPackage,lldt)) -depend: - $(CC) $(CFLAGS) -M $(DCFILES) >.depend - -clear: - rm -f *.o lld2d - --include .depend +romfs: + $(INSTALL_DIR) $(ROMFSDIR)/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/lld2d $(ROMFSDIR)/bin/lld2d + $(INSTALL_DIR) $(ROMFSDIR)/etc_ro + $(INSTALL_DATA) ./lld2d.conf $(ROMFSDIR)/etc_ro/lld2d.conf + $(INSTALL_DATA) ./icon.ico $(ROMFSDIR)/etc_ro/icon.ico + $(LN) icon.ico $(ROMFSDIR)/etc_ro/icon.large.ico \ No newline at end of file diff --git a/trunk/user/lldt/icon.large.ico b/trunk/user/lldt/icon.large.ico deleted file mode 100644 index 8cb966c838d5c84099a6d31a7b1ba76a29c8f91a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9662 zcmeHNdyG`|72f_|_chO*nVs3$ncbazKUwz4?(z~7u#NQr1s^n2OB$pW#8zrTEm|y= zR*4GKgvJ!ZBN}2fSQ-^$BpM?Ij1tfYH6{uuzTyKP=k)u2_ulc&W#_SK{Hu3!_Wtf; zX1?#7@0{Q7o|&?;AK|a7s|^3^%62xCl?BVn$}%vVD!T^8^W4_qns?J5aQph}ul18p zKG8Sdd{Yk{I;8ve@7GOq+_^G1 zI4IMnPuKqbezTu5XO3KZ?X`06z4z+w-MfYFgRP)1-8hM>)a}bJztpp5&+75x$MxXB zgZjuLkLdR8+x5Qt?$b@1HtE{6YxTP8uG61gdZ|uKOlV(UpH7=L%^2_!vl6>w;G%xN zUk3&Tw5h2{moHzg5>C#`w{P_!HaA-(7J3FNV*4f#mU0q$$-Q6ucJw4jf(<{Bby<&3_@DZDf z%$PAl%gf6p7z~ zx3YNg5}h+=E^zfob8`zmr&+mgX=#zx)>dt8ZIiaPc4=>K*N%=3>FCJi(rvi(rI)A+FTS|z{7Ac_mWF{M+f+Hn%5yNinzcSmmZ_1SS+R$6%|@lRb_PO z#Zv6pko3fY^{qCZK&<=a>Z`9Y`M7P{KlHiho|AR!{wUxg>2!mp8yW;$#O5O4k`tE} zPh7yoj!UPbF-@n_#{c91-4ygWxj1;acOSdQr%#{OSZ&;3d-TyqjqVp*{1eo?-^j?w zsMICvC7G;eTnv{Kxuo4(ngp>kTzdQZm=kgymv+MivCCxfvrc{X*=KoixiLEUdCt3i z{`om*p;c=lQH?}n8imDTwdAC=wF!;K6PifWX`(Kvb#?V>b1@pTxnwoQx&+R)#*j16 z7~dQD0*$p9z0voyg$ozzd+)vHg;Vg@i3e|T#thB)_)H0fY9t(vXt*XKhD#(S;3D86 zHWvXG3(u+60=3NBIROHnSU z%fh-${rG%7qaV&=4?XnI_kw@lzQ^T)@=7VMsM3ncDsn-M_KD$A?T$;ZAeVu`A-Us@ zzvPPx=Miv@82p$6Wb@|DQ^KE5Xs^C{RDnOo3>WYrmr5%xm_JQi)aMVXKM*uI1C3cZ zgSfC>VJ=a|#j0hfW5^k3%$$d|P{Zo7IlwjPRMyjO&A7)Oe)ysEPahO$Tz`B)1!JKX zSbIAzmH12(7cpEA8*nlC;`2ji0mKD4!+b&hi_usZbGt`*L8KW`27I9%Mv+J_0G1O(OL$dne zdi#wx-Y5hs=bGE+-tq0X|5=C~F);hVp<(2&-^75p-LY_wam|X0#f7nh#;p9O#%wOE zW#p3Mf3AmKdg-N-{qM!hV-n=P>74;E5-mC>eiFFgyp3KmPBmejFWf--va!S2t5RrpD~LY-$RBQq=;9@S_pUbGe!iiP8U-orJx3y z8bxT*TUXycw4t}g59Q=Haw);Sn=A|2dHV}CRciy?l zXoYxb(+7r(VQry()25fKp#auITqEVv5dH5w2ZY06^N}t6RURj(E7Bio7StHUA@}g*=^>c ze7Y$0JoUvnz|qhxx7<<)R`%LtvEfDMJbSa$iH%n}yLzOflh%#iRJXKubYX35t+7kd zjQbw9emF)CF6;lLOP30s1M+Hw__8Dl4A`@sIctvEc!9YK>uFl2wzkna(4%X}o0o3? zFI)CY)Uc7f_r}pfbo@Vm{(SxTSsH8 zAZ_Toweoo^r#8C%?2PME4Sd$g=8M<=z@PO$`|NMO{dQ6RPlnmcW!0)1fz!g9X>P;X z!NLsO(%95O!?WSk=d$zgqnE@Q#2BzIhdzB#{8khS|NrZzzbk!ABUV~NW3#bzLk7nrC9SUZy(c8pzQP=Ky?nQy3Vomg4_iyLO{aHfy@ES%6hiv~-ig1h{F;0jZ5A zO}~PAaWqqCT*&|IMWFXu)c>X6fA-mf25-HMHwnzl**ajZOQt1}OrsZ?k~l0@TZev8 zfEv&0+~I=fF1c{tMcMOS{9I4*I}FBvIw}Q!(E#CwlPCXc^ih`tW@5GQYCMsG)oU#+ zp41o(_@l8p4TYoN;m?^H!ZlI73jO$ex?+#dnFGK>j~qEt6kaL*$M>Gd*>>U;;Dt_T z#G0hP(Q6~-ghZmWxYi(-xvmIDYSCk?l~7F#b3{yo;V61t5vlfvkSqRd9Gv*z85up5 zsPR9(Bm36hACa_|*YL=g!5g*kN+gD!l!X^qfth%L6$alMyy*Kx(Z{kd1GoBvHRub~ zh%dmkTo})ASssQ9H5ZS^4Ss&d#%(ezZfr#ZWZ!W46+b6l`W9H@YWr5H_0z$z6q;DwoeIrilh=-*l#guQEgCwyM~iH(FDjNW7S zwaLbJ-L=`R1?qsl73zTggFWvN$Kh z;&9-#Qn!a6-mA85wc5g~@a;ER09FgH@vYH>?dK_tvBuDM-g&1~SVejAjmY=K7Y_k% z(AGj8-`YCx`qc3+HN*N-pK8+4(Fs|&aIr#{vgvPk$?n~Il=BRJ-;tve=kvXK@gC>9 z&pChQ-FKk{6MM!#s{sca_tbf^z7fxB!*aVO`9?KL_3 z{`;(p#wX5uPZbOA=Qfqs^D`S7TLjNAvS7haf diff --git a/trunk/user/lldt/src/Makefile b/trunk/user/lldt/src/Makefile index 746af879295..09cd5330539 100644 --- a/trunk/user/lldt/src/Makefile +++ b/trunk/user/lldt/src/Makefile @@ -1,3 +1,14 @@ -.PHONY: all -all: - @echo \*\*\* Do not "make" here. make in a build directory such as ../native-linux +OS_LAYER = osl-linux.c +LDFLAGS += -lshared + +all: lld2d + +include common.mk + +depend: + $(CC) $(CFLAGS) -M $(DCFILES) >.depend + +clear: + rm -f *.o lld2d + +-include .depend diff --git a/trunk/user/lldt/src/common.mk b/trunk/user/lldt/src/common.mk index 7b1a43d60ec..a518686b622 100644 --- a/trunk/user/lldt/src/common.mk +++ b/trunk/user/lldt/src/common.mk @@ -25,10 +25,4 @@ lld2d: $(DOBJFILES) lld2test: $(TOBJFILES) $(CC) $(LDFLAGS) -o $@ $(TOBJFILES) -romfs: - $(ROMFSINST) /bin/lld2d - $(ROMFSINST) /etc_ro/lld2d.conf - $(ROMFSINST) /etc_ro/icon.ico - $(ROMFSINST) -s icon.ico /etc_ro/icon.large.ico - # End diff --git a/trunk/user/networkmap/Makefile b/trunk/user/networkmap/Makefile index 5c30cf1fc22..e867d967e5a 100644 --- a/trunk/user/networkmap/Makefile +++ b/trunk/user/networkmap/Makefile @@ -1,23 +1,14 @@ -USERDIR = $(ROOTDIR)/user -SHDIR = $(ROOTDIR)/user/shared +include $(ROOTDIR)/rules.mk -EXEC = networkmap -OBJS = function.o networkmap.o +PKG_NAME:=networkmap -CFLAGS += -Wall -I. -I$(SHDIR) -I$(SHDIR)/include -CFLAGS += -s -DNO_PARALLEL -#CFLAGS += -DDEBUG -DDEBUG_MORE +include $(INCLUDE_DIR)/package.mk -LDFLAGS += -L$(SHDIR) -lshared +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -all: $(EXEC) - -$(EXEC): $(OBJS) - $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) +$(eval $(call BuildPackage,networkmap)) romfs: - $(ROMFSINST) /usr/sbin/$(EXEC) - -clean: - rm -rf *.o $(EXEC) *~ - + $(INSTALL_DIR) $(ROMFSDIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/networkmap $(ROMFSDIR)/usr/sbin/networkmap \ No newline at end of file diff --git a/trunk/user/networkmap/src/Makefile b/trunk/user/networkmap/src/Makefile new file mode 100644 index 00000000000..2bff451b100 --- /dev/null +++ b/trunk/user/networkmap/src/Makefile @@ -0,0 +1,13 @@ +EXEC = networkmap +OBJS = function.o networkmap.o + +LDFLAGS += -lshared + +all: $(EXEC) + +$(EXEC): $(OBJS) + $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) + +clean: + rm -rf *.o $(EXEC) *~ + diff --git a/trunk/user/networkmap/function.c b/trunk/user/networkmap/src/function.c similarity index 99% rename from trunk/user/networkmap/function.c rename to trunk/user/networkmap/src/function.c index 8f2fd13ea5f..eaf57d0667b 100644 --- a/trunk/user/networkmap/function.c +++ b/trunk/user/networkmap/src/function.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include "networkmap.h" diff --git a/trunk/user/networkmap/networkmap.c b/trunk/user/networkmap/src/networkmap.c similarity index 100% rename from trunk/user/networkmap/networkmap.c rename to trunk/user/networkmap/src/networkmap.c diff --git a/trunk/user/networkmap/networkmap.h b/trunk/user/networkmap/src/networkmap.h similarity index 98% rename from trunk/user/networkmap/networkmap.h rename to trunk/user/networkmap/src/networkmap.h index 1d937c958e6..9e5584f9c8a 100644 --- a/trunk/user/networkmap/networkmap.h +++ b/trunk/user/networkmap/src/networkmap.h @@ -1,5 +1,5 @@ -#include +#include // Service Ports #define HTTP_PORT 80 diff --git a/trunk/user/nvram/Makefile b/trunk/user/nvram/Makefile index 7b432b7d895..3cd9b5bd45e 100644 --- a/trunk/user/nvram/Makefile +++ b/trunk/user/nvram/Makefile @@ -1,50 +1,14 @@ -# Linux NVRAM Makefile -# -# Copyright 2004, ASUSTeK Inc. -# All Rights Reserved. -# -# THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY -# KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM -# SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE. -# -# $Id: Makefile,v 1.1 2007/06/08 10:22:42 arthur Exp $ -# +include $(ROOTDIR)/rules.mk -ifndef ROOTDIR -ROOTDIR=../.. -endif +PKG_NAME:=nvram -SHDIR = $(ROOTDIR)/user/shared +include $(INCLUDE_DIR)/package.mk -CFLAGS += -Wall -I. -CFLAGS += -I$(SHDIR) -I$(ROOTDIR)/$(LINUXDIR)/include/nvram -CFLAGS += -s -LDFLAGS += -L. -L../shared -lshared +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -ifdef CONFIG_MTD_NAND_RALINK -CFLAGS += -DCONFIG_MTD_NAND_RALINK -endif -ifdef CONFIG_MTD_NAND_MTK -CFLAGS += -DCONFIG_MTD_NAND_MTK -endif -ifdef CONFIG_MTD_NAND_USE_UBI_PART -CFLAGS += -DCONFIG_MTD_NAND_USE_UBI_PART -endif - -OBJS = nvram.o -TARGETS = nvram - -all: $(TARGETS) - -nvram: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) - $(STRIP) $@ - -clean: - rm -f $(TARGETS) *.o *.so - rm -f test_nvram +$(eval $(call BuildPackage,nvram)) romfs: - $(ROMFSINST) /usr/sbin/nvram - + $(INSTALL_DIR) $(ROMFSDIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(ROMFSDIR)/usr/sbin/nvram diff --git a/trunk/user/nvram/src/Makefile b/trunk/user/nvram/src/Makefile new file mode 100644 index 00000000000..e2655e48d7a --- /dev/null +++ b/trunk/user/nvram/src/Makefile @@ -0,0 +1,44 @@ +# Linux NVRAM Makefile +# +# Copyright 2004, ASUSTeK Inc. +# All Rights Reserved. +# +# THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY +# KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM +# SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS +# FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE. +# +# $Id: Makefile,v 1.1 2007/06/08 10:22:42 arthur Exp $ +# + +ifndef ROOTDIR +ROOTDIR=../.. +endif + +CFLAGS += -Wall -I. +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/include/nvram +CFLAGS += -s +LDFLAGS += -L. -lshared + +ifdef CONFIG_MTD_NAND_RALINK +CFLAGS += -DCONFIG_MTD_NAND_RALINK +endif +ifdef CONFIG_MTD_NAND_MTK +CFLAGS += -DCONFIG_MTD_NAND_MTK +endif +ifdef CONFIG_MTD_NAND_USE_UBI_PART +CFLAGS += -DCONFIG_MTD_NAND_USE_UBI_PART +endif + +OBJS = nvram.o +TARGETS = nvram + +all: $(TARGETS) + +nvram: $(OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) + $(STRIP) $@ + +clean: + rm -f $(TARGETS) *.o *.so + rm -f test_nvram diff --git a/trunk/user/nvram/nvram.c b/trunk/user/nvram/src/nvram.c similarity index 100% rename from trunk/user/nvram/nvram.c rename to trunk/user/nvram/src/nvram.c diff --git a/trunk/user/rc/Makefile b/trunk/user/rc/Makefile index 454f07e1ad7..6c1447e0de6 100644 --- a/trunk/user/rc/Makefile +++ b/trunk/user/rc/Makefile @@ -1,208 +1,147 @@ -ifndef ROOTDIR -ROOTDIR=../.. -endif - -USERDIR = $(ROOTDIR)/user -SHDIR = $(ROOTDIR)/user/shared -INSTALLDIR = $(ROOTDIR)/romfs +include $(ROOTDIR)/rules.mk -include $(SHDIR)/boards.mk -include $(SHDIR)/cflags.mk +PKG_NAME:=rc -CFLAGS += -s -I. -I$(SHDIR) -I$(SHDIR)/include -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/include/ralink +include $(INCLUDE_DIR)/package.mk -# Disable/Enable ugly httpd_check -#CFLAGS += -DHTTPD_CHECK +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/include/shared \ + $(if $(STORAGE_ENABLED),-I$(STAGING_DIR)/include/libdisk,) -LDFLAGS += -L. -lm -LDFLAGS += -liw -LDFLAGS += -L$(SHDIR) -lshared -ifeq ($(STORAGE_ENABLED),y) -CFLAGS += -I$(USERDIR)/libdisk -LDFLAGS += -L$(USERDIR)/libdisk -ldisk -endif +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -EXEC = rc - -OBJS = rc.o init.o auth.o services.o watchdog.o firewall_ex.o common_ex.o -OBJS += net.o net_lan.o net_wan.o net_wifi.o net_ppp.o services_ex.o rstats.o -OBJS += ralink.o gpio_pins.o detect_link.o detect_internet.o detect_wan.o -OBJS += vpn_server.o vpn_client.o -OBJS += gpio_btn.o btn_action.o -ifeq ($(CONFIG_FIRMWARE_INCLUDE_OPENVPN),y) -OBJS += vpn_openvpn.o -endif -ifeq ($(STORAGE_ENABLED),y) -OBJS += hotplug_stor.o -OBJS += services_stor.o -endif -ifdef CONFIG_USB_SUPPORT -OBJS += hotplug_usb.o usb_modem.o services_usb.o -endif -ifdef CONFIG_RTL8367 -OBJS += switch_rtl8367.o -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/rtl8367 -else -ifdef CONFIG_RAETH -OBJS += switch_mtk_esw.o -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/ethernet/raeth -else -ifdef CONFIG_RAETH_ESW -OBJS += switch_mtk_esw.o -CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/raeth -endif -endif -endif -ifdef CONFIG_RT3352_INIC_MII -OBJS += inicd.o -endif -ifdef CONFIG_IPV6 -OBJS += net6.o net_lan6.o net_wan6.o -endif -ifdef CONFIG_SMP -OBJS += smp.o -endif - -all: $(OBJS) Makefile - $(CC) -o $(EXEC) $(OBJS) $(LDFLAGS) - $(STRIP) $(EXEC) - -c.o: - $(CC) -c $*.c $(CFLAGS) - -clean: - rm -f *.o rc +$(eval $(call BuildPackage,rc)) romfs: - $(ROMFSINST) /sbin/$(EXEC) - cd $(INSTALLDIR) && rm -f init && ln -sf sbin/rc init - cd $(INSTALLDIR)/sbin && ln -sf rc init - cd $(INSTALLDIR)/sbin && ln -sf rc watchdog - cd $(INSTALLDIR)/sbin && ln -sf rc gpio_btn - cd $(INSTALLDIR)/sbin && ln -sf rc hotplug - cd $(INSTALLDIR)/sbin && ln -sf rc shutdown - cd $(INSTALLDIR)/sbin && ln -sf rc halt - cd $(INSTALLDIR)/sbin && ln -sf rc reboot - cd $(INSTALLDIR)/sbin && ln -sf rc ddns_updated - cd $(INSTALLDIR)/sbin && ln -sf rc ntpc_updated - cd $(INSTALLDIR)/sbin && ln -sf rc start_ddns - cd $(INSTALLDIR)/sbin && ln -sf rc restart_dns - cd $(INSTALLDIR)/sbin && ln -sf rc restart_dhcpd - cd $(INSTALLDIR)/sbin && ln -sf rc restart_vpn_server - cd $(INSTALLDIR)/sbin && ln -sf rc restart_vpn_client - cd $(INSTALLDIR)/sbin && ln -sf rc run_telnetd - cd $(INSTALLDIR)/sbin && ln -sf rc restart_firewall - cd $(INSTALLDIR)/sbin && ln -sf rc pids - cd $(INSTALLDIR)/sbin && ln -sf rc rstats - cd $(INSTALLDIR)/sbin && ln -sf rc stop_wan - cd $(INSTALLDIR)/sbin && ln -sf rc restart_wan - cd $(INSTALLDIR)/sbin && ln -sf rc restart_networkmap - cd $(INSTALLDIR)/sbin && ln -sf rc detect_link - cd $(INSTALLDIR)/sbin && ln -sf rc detect_internet - cd $(INSTALLDIR)/sbin && ln -sf rc detect_wan - cd $(INSTALLDIR)/sbin && ln -sf rc reset_to_defaults - cd $(INSTALLDIR)/sbin && ln -sf rc lan_eeprom_mac - cd $(INSTALLDIR)/sbin && ln -sf rc wan_eeprom_mac - cd $(INSTALLDIR)/sbin && ln -sf rc leds_front - cd $(INSTALLDIR)/sbin && ln -sf rc leds_ether - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_restart - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_toggle - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_toggle_off - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_toggle_on - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_enable - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_disable - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_guest_enable - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_guest_disable - cd $(INSTALLDIR)/sbin && ln -sf rc radio2_eeprom_mac + $(INSTALL_DIR) $(ROMFSDIR)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/rc $(ROMFSDIR)/sbin/rc + $(LN) sbin/rc $(ROMFSDIR)/init + $(LN) rc $(ROMFSDIR)/sbin/init + $(LN) rc $(ROMFSDIR)/sbin/watchdog + $(LN) rc $(ROMFSDIR)/sbin/gpio_btn + $(LN) rc $(ROMFSDIR)/sbin/hotplug + $(LN) rc $(ROMFSDIR)/sbin/shutdown + $(LN) rc $(ROMFSDIR)/sbin/halt + $(LN) rc $(ROMFSDIR)/sbin/reboot + $(LN) rc $(ROMFSDIR)/sbin/ddns_updated + $(LN) rc $(ROMFSDIR)/sbin/ntpc_updated + $(LN) rc $(ROMFSDIR)/sbin/start_ddns + $(LN) rc $(ROMFSDIR)/sbin/restart_dns + $(LN) rc $(ROMFSDIR)/sbin/restart_dhcpd + $(LN) rc $(ROMFSDIR)/sbin/restart_vpn_server + $(LN) rc $(ROMFSDIR)/sbin/restart_vpn_client + $(LN) rc $(ROMFSDIR)/sbin/run_telnetd + $(LN) rc $(ROMFSDIR)/sbin/restart_firewall + $(LN) rc $(ROMFSDIR)/sbin/pids + $(LN) rc $(ROMFSDIR)/sbin/rstats + $(LN) rc $(ROMFSDIR)/sbin/stop_wan + $(LN) rc $(ROMFSDIR)/sbin/restart_wan + $(LN) rc $(ROMFSDIR)/sbin/restart_networkmap + $(LN) rc $(ROMFSDIR)/sbin/detect_link + $(LN) rc $(ROMFSDIR)/sbin/detect_internet + $(LN) rc $(ROMFSDIR)/sbin/detect_wan + $(LN) rc $(ROMFSDIR)/sbin/reset_to_defaults + $(LN) rc $(ROMFSDIR)/sbin/lan_eeprom_mac + $(LN) rc $(ROMFSDIR)/sbin/wan_eeprom_mac + $(LN) rc $(ROMFSDIR)/sbin/leds_front + $(LN) rc $(ROMFSDIR)/sbin/leds_ether + $(LN) rc $(ROMFSDIR)/sbin/radio2_restart + $(LN) rc $(ROMFSDIR)/sbin/radio2_toggle + $(LN) rc $(ROMFSDIR)/sbin/radio2_toggle_off + $(LN) rc $(ROMFSDIR)/sbin/radio2_toggle_on + $(LN) rc $(ROMFSDIR)/sbin/radio2_enable + $(LN) rc $(ROMFSDIR)/sbin/radio2_disable + $(LN) rc $(ROMFSDIR)/sbin/radio2_guest_enable + $(LN) rc $(ROMFSDIR)/sbin/radio2_guest_disable + $(LN) rc $(ROMFSDIR)/sbin/radio2_eeprom_mac ifeq ($(BOARD_HAS_5G_RADIO),1) - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_restart - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_toggle - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_toggle_off - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_toggle_on - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_enable - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_disable - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_guest_enable - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_guest_disable - cd $(INSTALLDIR)/sbin && ln -sf rc radio5_eeprom_mac + $(LN) rc $(ROMFSDIR)/sbin/radio5_restart + $(LN) rc $(ROMFSDIR)/sbin/radio5_toggle + $(LN) rc $(ROMFSDIR)/sbin/radio5_toggle_off + $(LN) rc $(ROMFSDIR)/sbin/radio5_toggle_on + $(LN) rc $(ROMFSDIR)/sbin/radio5_enable + $(LN) rc $(ROMFSDIR)/sbin/radio5_disable + $(LN) rc $(ROMFSDIR)/sbin/radio5_guest_enable + $(LN) rc $(ROMFSDIR)/sbin/radio5_guest_disable + $(LN) rc $(ROMFSDIR)/sbin/radio5_eeprom_mac endif ifdef CONFIG_RTL8367 - cd $(INSTALLDIR)/sbin && ln -sf rc rtl8367 + $(LN) rc $(ROMFSDIR)/sbin/rtl8367 endif ifdef CONFIG_RAETH_ESW - cd $(INSTALLDIR)/sbin && ln -sf rc mtk_esw + $(LN) rc $(ROMFSDIR)/sbin/mtk_esw endif ifdef CONFIG_RAETH - cd $(INSTALLDIR)/sbin && ln -sf rc mtk_esw + $(LN) rc $(ROMFSDIR)/sbin/mtk_esw endif ifdef CONFIG_RT3352_INIC_MII - cd $(INSTALLDIR)/sbin && ln -sf rc inicd + $(LN) rc $(ROMFSDIR)/sbin/inicd endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_OPENVPN),y) - cd $(INSTALLDIR)/sbin && ln -sf rc ovpn_export_client + $(LN) rc $(ROMFSDIR)/sbin/ovpn_export_client endif ifeq ($(STORAGE_ENABLED),y) ifeq ($(CONFIG_FIRMWARE_INCLUDE_SMBD),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_samba - cd $(INSTALLDIR)/sbin && ln -sf rc stop_samba - cd $(INSTALLDIR)/sbin && ln -sf rc run_ftpsamba - cd $(INSTALLDIR)/sbin && ln -sf rc stop_ftpsamba + $(LN) rc $(ROMFSDIR)/sbin/run_samba + $(LN) rc $(ROMFSDIR)/sbin/stop_samba + $(LN) rc $(ROMFSDIR)/sbin/run_ftpsamba + $(LN) rc $(ROMFSDIR)/sbin/stop_ftpsamba endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_FTPD),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_ftp - cd $(INSTALLDIR)/sbin && ln -sf rc stop_ftp + $(LN) rc $(ROMFSDIR)/sbin/run_ftp + $(LN) rc $(ROMFSDIR)/sbin/stop_ftp ifneq ($(CONFIG_FIRMWARE_INCLUDE_SMBD),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_ftpsamba - cd $(INSTALLDIR)/sbin && ln -sf rc stop_ftpsamba + $(LN) rc $(ROMFSDIR)/sbin/run_ftpsamba + $(LN) rc $(ROMFSDIR)/sbin/stop_ftpsamba endif endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_NFSD),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_nfsd - cd $(INSTALLDIR)/sbin && ln -sf rc stop_nfsd + $(LN) rc $(ROMFSDIR)/sbin/run_nfsd + $(LN) rc $(ROMFSDIR)/sbin/stop_nfsd endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_MINIDLNA),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_minidlna - cd $(INSTALLDIR)/sbin && ln -sf rc stop_minidlna + $(LN) rc $(ROMFSDIR)/sbin/run_minidlna + $(LN) rc $(ROMFSDIR)/sbin/stop_minidlna endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_FIREFLY),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_firefly - cd $(INSTALLDIR)/sbin && ln -sf rc stop_firefly + $(LN) rc $(ROMFSDIR)/sbin/run_firefly + $(LN) rc $(ROMFSDIR)/sbin/stop_firefly endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_TRANSMISSION),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_transmission - cd $(INSTALLDIR)/sbin && ln -sf rc stop_transmission + $(LN) rc $(ROMFSDIR)/sbin/run_transmission + $(LN) rc $(ROMFSDIR)/sbin/stop_transmission endif ifeq ($(CONFIG_FIRMWARE_INCLUDE_ARIA),y) - cd $(INSTALLDIR)/sbin && ln -sf rc run_aria - cd $(INSTALLDIR)/sbin && ln -sf rc stop_aria + $(LN) rc $(ROMFSDIR)/sbin/run_aria + $(LN) rc $(ROMFSDIR)/sbin/stop_aria endif endif ifeq ($(STORAGE_ENABLED),y) - cd $(INSTALLDIR)/sbin && ln -sf rc ejall + $(LN) rc $(ROMFSDIR)/sbin/ejall endif ifdef CONFIG_ATA - cd $(INSTALLDIR)/sbin && ln -sf rc ejata + $(LN) rc $(ROMFSDIR)/sbin/ejata endif ifdef CONFIG_MMC_BLOCK - cd $(INSTALLDIR)/sbin && ln -sf rc ejmmc - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_mmc + $(LN) rc $(ROMFSDIR)/sbin/ejmmc + $(LN) rc $(ROMFSDIR)/sbin/mdev_mmc endif ifdef CONFIG_BLK_DEV_SD - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_sd + $(LN) rc $(ROMFSDIR)/sbin/mdev_sd endif ifdef CONFIG_USB_SUPPORT - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_sr - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_sg - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_lp - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_net - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_tty - cd $(INSTALLDIR)/sbin && ln -sf rc mdev_wdm - cd $(INSTALLDIR)/sbin && ln -sf rc zerocd - cd $(INSTALLDIR)/sbin && ln -sf rc usb5v - cd $(INSTALLDIR)/sbin && ln -sf rc ejusb - cd $(INSTALLDIR)/sbin && ln -sf rc ejusb1 + $(LN) rc $(ROMFSDIR)/sbin/mdev_sr + $(LN) rc $(ROMFSDIR)/sbin/mdev_sg + $(LN) rc $(ROMFSDIR)/sbin/mdev_lp + $(LN) rc $(ROMFSDIR)/sbin/mdev_net + $(LN) rc $(ROMFSDIR)/sbin/mdev_tty + $(LN) rc $(ROMFSDIR)/sbin/mdev_wdm + $(LN) rc $(ROMFSDIR)/sbin/zerocd + $(LN) rc $(ROMFSDIR)/sbin/usb5v + $(LN) rc $(ROMFSDIR)/sbin/ejusb + $(LN) rc $(ROMFSDIR)/sbin/ejusb1 ifneq ($(BOARD_NUM_USB_PORTS),1) - cd $(INSTALLDIR)/sbin && ln -sf rc ejusb2 -endif + $(LN) rc $(ROMFSDIR)/sbin/ejusb2 endif +endif \ No newline at end of file diff --git a/trunk/user/rc/src/Makefile b/trunk/user/rc/src/Makefile new file mode 100644 index 00000000000..c15a81a40e8 --- /dev/null +++ b/trunk/user/rc/src/Makefile @@ -0,0 +1,65 @@ +include $(BOARD_CONFIG) +include $(CFLAGS_CONFIG) + +CFLAGS += -s -I. +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/include/ralink + +# Disable/Enable ugly httpd_check +#CFLAGS += -DHTTPD_CHECK + +LDFLAGS += -L. -lm +LDFLAGS += -liw -lshared +ifeq ($(STORAGE_ENABLED),y) +LDFLAGS += -ldisk +endif + +EXEC = rc + +OBJS = rc.o init.o auth.o services.o watchdog.o firewall_ex.o common_ex.o +OBJS += net.o net_lan.o net_wan.o net_wifi.o net_ppp.o services_ex.o rstats.o +OBJS += ralink.o gpio_pins.o detect_link.o detect_internet.o detect_wan.o +OBJS += vpn_server.o vpn_client.o +OBJS += gpio_btn.o btn_action.o +ifeq ($(CONFIG_FIRMWARE_INCLUDE_OPENVPN),y) +OBJS += vpn_openvpn.o +endif +ifeq ($(STORAGE_ENABLED),y) +OBJS += hotplug_stor.o +OBJS += services_stor.o +endif +ifdef CONFIG_USB_SUPPORT +OBJS += hotplug_usb.o usb_modem.o services_usb.o +endif +ifdef CONFIG_RTL8367 +OBJS += switch_rtl8367.o +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/rtl8367 +else +ifdef CONFIG_RAETH +OBJS += switch_mtk_esw.o +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/ethernet/raeth +else +ifdef CONFIG_RAETH_ESW +OBJS += switch_mtk_esw.o +CFLAGS += -I$(ROOTDIR)/$(LINUXDIR)/drivers/net/raeth +endif +endif +endif +ifdef CONFIG_RT3352_INIC_MII +OBJS += inicd.o +endif +ifdef CONFIG_IPV6 +OBJS += net6.o net_lan6.o net_wan6.o +endif +ifdef CONFIG_SMP +OBJS += smp.o +endif + +all: $(OBJS) Makefile + $(CC) -o $(EXEC) $(OBJS) $(LDFLAGS) + $(STRIP) $(EXEC) + +c.o: + $(CC) -c $*.c $(CFLAGS) + +clean: + rm -f *.o rc diff --git a/trunk/user/rc/auth.c b/trunk/user/rc/src/auth.c similarity index 100% rename from trunk/user/rc/auth.c rename to trunk/user/rc/src/auth.c diff --git a/trunk/user/rc/btn_action.c b/trunk/user/rc/src/btn_action.c similarity index 100% rename from trunk/user/rc/btn_action.c rename to trunk/user/rc/src/btn_action.c diff --git a/trunk/user/rc/common_ex.c b/trunk/user/rc/src/common_ex.c similarity index 100% rename from trunk/user/rc/common_ex.c rename to trunk/user/rc/src/common_ex.c diff --git a/trunk/user/rc/detect_internet.c b/trunk/user/rc/src/detect_internet.c similarity index 100% rename from trunk/user/rc/detect_internet.c rename to trunk/user/rc/src/detect_internet.c diff --git a/trunk/user/rc/detect_link.c b/trunk/user/rc/src/detect_link.c similarity index 100% rename from trunk/user/rc/detect_link.c rename to trunk/user/rc/src/detect_link.c diff --git a/trunk/user/rc/detect_wan.c b/trunk/user/rc/src/detect_wan.c similarity index 100% rename from trunk/user/rc/detect_wan.c rename to trunk/user/rc/src/detect_wan.c diff --git a/trunk/user/rc/firewall_ex.c b/trunk/user/rc/src/firewall_ex.c similarity index 100% rename from trunk/user/rc/firewall_ex.c rename to trunk/user/rc/src/firewall_ex.c diff --git a/trunk/user/rc/gpio_btn.c b/trunk/user/rc/src/gpio_btn.c similarity index 100% rename from trunk/user/rc/gpio_btn.c rename to trunk/user/rc/src/gpio_btn.c diff --git a/trunk/user/rc/gpio_pins.c b/trunk/user/rc/src/gpio_pins.c similarity index 100% rename from trunk/user/rc/gpio_pins.c rename to trunk/user/rc/src/gpio_pins.c diff --git a/trunk/user/rc/gpio_pins.h b/trunk/user/rc/src/gpio_pins.h similarity index 100% rename from trunk/user/rc/gpio_pins.h rename to trunk/user/rc/src/gpio_pins.h diff --git a/trunk/user/rc/hotplug_stor.c b/trunk/user/rc/src/hotplug_stor.c similarity index 100% rename from trunk/user/rc/hotplug_stor.c rename to trunk/user/rc/src/hotplug_stor.c diff --git a/trunk/user/rc/hotplug_usb.c b/trunk/user/rc/src/hotplug_usb.c similarity index 100% rename from trunk/user/rc/hotplug_usb.c rename to trunk/user/rc/src/hotplug_usb.c diff --git a/trunk/user/rc/inicd.c b/trunk/user/rc/src/inicd.c similarity index 100% rename from trunk/user/rc/inicd.c rename to trunk/user/rc/src/inicd.c diff --git a/trunk/user/rc/init.c b/trunk/user/rc/src/init.c similarity index 100% rename from trunk/user/rc/init.c rename to trunk/user/rc/src/init.c diff --git a/trunk/user/rc/net.c b/trunk/user/rc/src/net.c similarity index 100% rename from trunk/user/rc/net.c rename to trunk/user/rc/src/net.c diff --git a/trunk/user/rc/net6.c b/trunk/user/rc/src/net6.c similarity index 100% rename from trunk/user/rc/net6.c rename to trunk/user/rc/src/net6.c diff --git a/trunk/user/rc/net_lan.c b/trunk/user/rc/src/net_lan.c similarity index 100% rename from trunk/user/rc/net_lan.c rename to trunk/user/rc/src/net_lan.c diff --git a/trunk/user/rc/net_lan6.c b/trunk/user/rc/src/net_lan6.c similarity index 100% rename from trunk/user/rc/net_lan6.c rename to trunk/user/rc/src/net_lan6.c diff --git a/trunk/user/rc/net_ppp.c b/trunk/user/rc/src/net_ppp.c similarity index 100% rename from trunk/user/rc/net_ppp.c rename to trunk/user/rc/src/net_ppp.c diff --git a/trunk/user/rc/net_wan.c b/trunk/user/rc/src/net_wan.c similarity index 100% rename from trunk/user/rc/net_wan.c rename to trunk/user/rc/src/net_wan.c diff --git a/trunk/user/rc/net_wan6.c b/trunk/user/rc/src/net_wan6.c similarity index 100% rename from trunk/user/rc/net_wan6.c rename to trunk/user/rc/src/net_wan6.c diff --git a/trunk/user/rc/net_wifi.c b/trunk/user/rc/src/net_wifi.c similarity index 100% rename from trunk/user/rc/net_wifi.c rename to trunk/user/rc/src/net_wifi.c diff --git a/trunk/user/rc/ralink.c b/trunk/user/rc/src/ralink.c similarity index 100% rename from trunk/user/rc/ralink.c rename to trunk/user/rc/src/ralink.c diff --git a/trunk/user/rc/rc.c b/trunk/user/rc/src/rc.c similarity index 100% rename from trunk/user/rc/rc.c rename to trunk/user/rc/src/rc.c diff --git a/trunk/user/rc/rc.h b/trunk/user/rc/src/rc.h similarity index 100% rename from trunk/user/rc/rc.h rename to trunk/user/rc/src/rc.h diff --git a/trunk/user/rc/rstats.c b/trunk/user/rc/src/rstats.c similarity index 99% rename from trunk/user/rc/rstats.c rename to trunk/user/rc/src/rstats.c index f158bb8cfc7..141267f4dba 100644 --- a/trunk/user/rc/rstats.c +++ b/trunk/user/rc/src/rstats.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "rc.h" diff --git a/trunk/user/rc/services.c b/trunk/user/rc/src/services.c similarity index 100% rename from trunk/user/rc/services.c rename to trunk/user/rc/src/services.c diff --git a/trunk/user/rc/services_ex.c b/trunk/user/rc/src/services_ex.c similarity index 100% rename from trunk/user/rc/services_ex.c rename to trunk/user/rc/src/services_ex.c diff --git a/trunk/user/rc/services_stor.c b/trunk/user/rc/src/services_stor.c similarity index 100% rename from trunk/user/rc/services_stor.c rename to trunk/user/rc/src/services_stor.c diff --git a/trunk/user/rc/services_usb.c b/trunk/user/rc/src/services_usb.c similarity index 100% rename from trunk/user/rc/services_usb.c rename to trunk/user/rc/src/services_usb.c diff --git a/trunk/user/rc/smp.c b/trunk/user/rc/src/smp.c similarity index 100% rename from trunk/user/rc/smp.c rename to trunk/user/rc/src/smp.c diff --git a/trunk/user/rc/switch.h b/trunk/user/rc/src/switch.h similarity index 100% rename from trunk/user/rc/switch.h rename to trunk/user/rc/src/switch.h diff --git a/trunk/user/rc/switch_mtk_esw.c b/trunk/user/rc/src/switch_mtk_esw.c similarity index 100% rename from trunk/user/rc/switch_mtk_esw.c rename to trunk/user/rc/src/switch_mtk_esw.c diff --git a/trunk/user/rc/switch_rtl8367.c b/trunk/user/rc/src/switch_rtl8367.c similarity index 100% rename from trunk/user/rc/switch_rtl8367.c rename to trunk/user/rc/src/switch_rtl8367.c diff --git a/trunk/user/rc/usb_modem.c b/trunk/user/rc/src/usb_modem.c similarity index 100% rename from trunk/user/rc/usb_modem.c rename to trunk/user/rc/src/usb_modem.c diff --git a/trunk/user/rc/vpn_client.c b/trunk/user/rc/src/vpn_client.c similarity index 100% rename from trunk/user/rc/vpn_client.c rename to trunk/user/rc/src/vpn_client.c diff --git a/trunk/user/rc/vpn_openvpn.c b/trunk/user/rc/src/vpn_openvpn.c similarity index 100% rename from trunk/user/rc/vpn_openvpn.c rename to trunk/user/rc/src/vpn_openvpn.c diff --git a/trunk/user/rc/vpn_server.c b/trunk/user/rc/src/vpn_server.c similarity index 100% rename from trunk/user/rc/vpn_server.c rename to trunk/user/rc/src/vpn_server.c diff --git a/trunk/user/rc/watchdog.c b/trunk/user/rc/src/watchdog.c similarity index 100% rename from trunk/user/rc/watchdog.c rename to trunk/user/rc/src/watchdog.c diff --git a/trunk/user/shared/.gitignore b/trunk/user/shared/.gitignore deleted file mode 100644 index 75ea9c2e996..00000000000 --- a/trunk/user/shared/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -board.mk -include/ralink_board.h \ No newline at end of file diff --git a/trunk/user/shared/Makefile b/trunk/user/shared/Makefile index e4d5f1ee8f1..2a884ccd33f 100644 --- a/trunk/user/shared/Makefile +++ b/trunk/user/shared/Makefile @@ -1,24 +1,12 @@ -ifndef ROOTDIR -ROOTDIR=../.. -endif +include $(ROOTDIR)/rules.mk -include boards.mk -include cflags.mk +PKG_NAME:=shared +PKG_INSTALL:=1 -CFLAGS += -fPIC -D_GNU_SOURCE -CFLAGS += -Wall -I. -I./include -I$(ROOTDIR)/$(LINUXDIR)/include/nvram +include $(INCLUDE_DIR)/package.mk -LDFLAGS += -L. - -OBJS := shutils.o netutils.o rtutils.o defaults.o nvram_linux.o notify_rc.o bin_sem_asus.o flash_mtd.o pids.o gpioutils.o - -all: libshared.so - -libshared.so: $(OBJS) - $(LD) -shared -o $@ $^ +$(eval $(call BuildPackage,shared)) romfs: - $(ROMFSINST) -S /lib/libshared.so - -clean: - rm -f *.o libshared.so + $(INSTALL_DIR) $(ROMFSDIR)/lib + $(CP) $(PKG_BUILD_DIR)/libshared.so $(ROMFSDIR)/lib/ \ No newline at end of file diff --git a/trunk/user/shared/src/Makefile b/trunk/user/shared/src/Makefile new file mode 100644 index 00000000000..a088c3dab0a --- /dev/null +++ b/trunk/user/shared/src/Makefile @@ -0,0 +1,33 @@ +ifndef ROOTDIR +ROOTDIR=../.. +endif + +include $(BOARD_CONFIG) +include $(CFLAGS_CONFIG) + +DESTDIR = /usr +INSTALL = install + +CFLAGS += -fPIC -D_GNU_SOURCE +CFLAGS += -Wall -I. -I./include -I$(ROOTDIR)/$(LINUXDIR)/include/nvram + +LDFLAGS += -L. + +OBJS := shutils.o netutils.o rtutils.o defaults.o nvram_linux.o notify_rc.o bin_sem_asus.o flash_mtd.o pids.o gpioutils.o + +HEADERS := $(shell ls *.h) +HEADERS += $(shell ls include/*.h) + +all: libshared.so + +libshared.so: $(OBJS) + $(LD) -shared -o $@ $^ + +install: + $(INSTALL) -d $(DESTDIR)/lib + $(INSTALL) -m 755 libshared.so $(DESTDIR)/lib + $(INSTALL) -d $(DESTDIR)/include/shared + $(INSTALL) -m 644 $(HEADERS) $(DESTDIR)/include/shared + +clean: + rm -f *.o libshared.so diff --git a/trunk/user/shared/bin_sem_asus.c b/trunk/user/shared/src/bin_sem_asus.c similarity index 100% rename from trunk/user/shared/bin_sem_asus.c rename to trunk/user/shared/src/bin_sem_asus.c diff --git a/trunk/user/shared/bin_sem_asus.h b/trunk/user/shared/src/bin_sem_asus.h similarity index 100% rename from trunk/user/shared/bin_sem_asus.h rename to trunk/user/shared/src/bin_sem_asus.h diff --git a/trunk/user/shared/defaults.c b/trunk/user/shared/src/defaults.c similarity index 100% rename from trunk/user/shared/defaults.c rename to trunk/user/shared/src/defaults.c diff --git a/trunk/user/shared/defaults.h b/trunk/user/shared/src/defaults.h similarity index 100% rename from trunk/user/shared/defaults.h rename to trunk/user/shared/src/defaults.h diff --git a/trunk/user/shared/flash_mtd.c b/trunk/user/shared/src/flash_mtd.c similarity index 100% rename from trunk/user/shared/flash_mtd.c rename to trunk/user/shared/src/flash_mtd.c diff --git a/trunk/user/shared/flash_mtd.h b/trunk/user/shared/src/flash_mtd.h similarity index 100% rename from trunk/user/shared/flash_mtd.h rename to trunk/user/shared/src/flash_mtd.h diff --git a/trunk/user/shared/gpioutils.c b/trunk/user/shared/src/gpioutils.c similarity index 100% rename from trunk/user/shared/gpioutils.c rename to trunk/user/shared/src/gpioutils.c diff --git a/trunk/user/shared/gpioutils.h b/trunk/user/shared/src/gpioutils.h similarity index 100% rename from trunk/user/shared/gpioutils.h rename to trunk/user/shared/src/gpioutils.h diff --git a/trunk/user/shared/src/include/.gitignore b/trunk/user/shared/src/include/.gitignore new file mode 100644 index 00000000000..42fb06faf4b --- /dev/null +++ b/trunk/user/shared/src/include/.gitignore @@ -0,0 +1 @@ +ralink_board.h \ No newline at end of file diff --git a/trunk/user/shared/include/bsd_queue.h b/trunk/user/shared/src/include/bsd_queue.h similarity index 100% rename from trunk/user/shared/include/bsd_queue.h rename to trunk/user/shared/src/include/bsd_queue.h diff --git a/trunk/user/shared/include/ibox.h b/trunk/user/shared/src/include/ibox.h similarity index 100% rename from trunk/user/shared/include/ibox.h rename to trunk/user/shared/src/include/ibox.h diff --git a/trunk/user/shared/include/mtd-abi.h b/trunk/user/shared/src/include/mtd-abi.h similarity index 100% rename from trunk/user/shared/include/mtd-abi.h rename to trunk/user/shared/src/include/mtd-abi.h diff --git a/trunk/user/shared/include/ralink_boards.h b/trunk/user/shared/src/include/ralink_boards.h similarity index 100% rename from trunk/user/shared/include/ralink_boards.h rename to trunk/user/shared/src/include/ralink_boards.h diff --git a/trunk/user/shared/include/ralink_priv.h b/trunk/user/shared/src/include/ralink_priv.h similarity index 100% rename from trunk/user/shared/include/ralink_priv.h rename to trunk/user/shared/src/include/ralink_priv.h diff --git a/trunk/user/shared/netutils.c b/trunk/user/shared/src/netutils.c similarity index 100% rename from trunk/user/shared/netutils.c rename to trunk/user/shared/src/netutils.c diff --git a/trunk/user/shared/netutils.h b/trunk/user/shared/src/netutils.h similarity index 100% rename from trunk/user/shared/netutils.h rename to trunk/user/shared/src/netutils.h diff --git a/trunk/user/shared/notify_rc.c b/trunk/user/shared/src/notify_rc.c similarity index 100% rename from trunk/user/shared/notify_rc.c rename to trunk/user/shared/src/notify_rc.c diff --git a/trunk/user/shared/notify_rc.h b/trunk/user/shared/src/notify_rc.h similarity index 100% rename from trunk/user/shared/notify_rc.h rename to trunk/user/shared/src/notify_rc.h diff --git a/trunk/user/shared/nvram_linux.c b/trunk/user/shared/src/nvram_linux.c similarity index 100% rename from trunk/user/shared/nvram_linux.c rename to trunk/user/shared/src/nvram_linux.c diff --git a/trunk/user/shared/nvram_linux.h b/trunk/user/shared/src/nvram_linux.h similarity index 100% rename from trunk/user/shared/nvram_linux.h rename to trunk/user/shared/src/nvram_linux.h diff --git a/trunk/user/shared/pids.c b/trunk/user/shared/src/pids.c similarity index 100% rename from trunk/user/shared/pids.c rename to trunk/user/shared/src/pids.c diff --git a/trunk/user/shared/rstats.h b/trunk/user/shared/src/rstats.h similarity index 100% rename from trunk/user/shared/rstats.h rename to trunk/user/shared/src/rstats.h diff --git a/trunk/user/shared/rtutils.c b/trunk/user/shared/src/rtutils.c similarity index 100% rename from trunk/user/shared/rtutils.c rename to trunk/user/shared/src/rtutils.c diff --git a/trunk/user/shared/rtutils.h b/trunk/user/shared/src/rtutils.h similarity index 100% rename from trunk/user/shared/rtutils.h rename to trunk/user/shared/src/rtutils.h diff --git a/trunk/user/shared/shutils.c b/trunk/user/shared/src/shutils.c similarity index 100% rename from trunk/user/shared/shutils.c rename to trunk/user/shared/src/shutils.c diff --git a/trunk/user/shared/shutils.h b/trunk/user/shared/src/shutils.h similarity index 100% rename from trunk/user/shared/shutils.h rename to trunk/user/shared/src/shutils.h diff --git a/trunk/user/u2ec/Makefile b/trunk/user/u2ec/Makefile index 9337b80fa22..f2b7d6186b9 100644 --- a/trunk/user/u2ec/Makefile +++ b/trunk/user/u2ec/Makefile @@ -1,45 +1,14 @@ -# -# U2EC Makefile -# -# Copyright (C) 2008 ASUSTeK Corporation -# -# +include $(ROOTDIR)/rules.mk -TOP := $(shell pwd)/.. -SRCBASE := $(TOP)/.. -INSTALLDIR := $(ROOTDIR)/romfs +PKG_NAME:=u2ec -PROGS = u2ec -OBJS = usbsock.o testusb.o -DEBUG = n +include $(INCLUDE_DIR)/package.mk -ifeq ($(DEBUG),y) - DEBFLAGS = -O -g -DU2EC_DEBUG - DEBFLAGS += -DPDEBUG_SENDSECV - DEBFLAGS += -DPDEBUG_DECODE - OBJS += debug.o decode.o -else - DEBFLAGS = -s -endif +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -CFLAGS += -DSUPPORT_LPRng -CFLAGS += -I$(TOP)/shared -CFLAGS += -Wall -I. -CFLAGS += $(DEBFLAGS) -CFLAGS += -ffunction-sections -fdata-sections - -LDFLAGS += -lpthread -LDFLAGS += -L$(TOP)/shared -lshared -LDFLAGS += -lusb -LDFLAGS += -Wl,--gc-sections - -all: $(PROGS) - -$(PROGS): $(OBJS) - $(CC) -o $(PROGS) $(OBJS) $(CFLAGS) $(LDFLAGS) +$(eval $(call BuildPackage,u2ec)) romfs: - $(ROMFSINST) /usr/sbin/$(PROGS) - -clean: - rm -f $(PROGS) *.o *~ + $(INSTALL_DIR) $(ROMFSDIR)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/u2ec $(ROMFSDIR)/usr/sbin/u2ec diff --git a/trunk/user/u2ec/src/Makefile b/trunk/user/u2ec/src/Makefile new file mode 100644 index 00000000000..dff744606c2 --- /dev/null +++ b/trunk/user/u2ec/src/Makefile @@ -0,0 +1,37 @@ +# +# U2EC Makefile +# +# Copyright (C) 2008 ASUSTeK Corporation +# +# + +PROGS = u2ec +OBJS = usbsock.o testusb.o +DEBUG = n + +ifeq ($(DEBUG),y) + DEBFLAGS = -O -g -DU2EC_DEBUG + DEBFLAGS += -DPDEBUG_SENDSECV + DEBFLAGS += -DPDEBUG_DECODE + OBJS += debug.o decode.o +else + DEBFLAGS = -s +endif + +CFLAGS += -DSUPPORT_LPRng +CFLAGS += -Wall -I. +CFLAGS += $(DEBFLAGS) +CFLAGS += -ffunction-sections -fdata-sections + +LDFLAGS += -lpthread +LDFLAGS += -lshared +LDFLAGS += -lusb +LDFLAGS += -Wl,--gc-sections + +all: $(PROGS) + +$(PROGS): $(OBJS) + $(CC) -o $(PROGS) $(OBJS) $(CFLAGS) $(LDFLAGS) + +clean: + rm -f $(PROGS) *.o *~ diff --git a/trunk/user/u2ec/debug.c b/trunk/user/u2ec/src/debug.c similarity index 100% rename from trunk/user/u2ec/debug.c rename to trunk/user/u2ec/src/debug.c diff --git a/trunk/user/u2ec/decode.c b/trunk/user/u2ec/src/decode.c similarity index 100% rename from trunk/user/u2ec/decode.c rename to trunk/user/u2ec/src/decode.c diff --git a/trunk/user/u2ec/decode.h b/trunk/user/u2ec/src/decode.h similarity index 100% rename from trunk/user/u2ec/decode.h rename to trunk/user/u2ec/src/decode.h diff --git a/trunk/user/u2ec/poppack.h b/trunk/user/u2ec/src/poppack.h similarity index 100% rename from trunk/user/u2ec/poppack.h rename to trunk/user/u2ec/src/poppack.h diff --git a/trunk/user/u2ec/pshpack1.h b/trunk/user/u2ec/src/pshpack1.h similarity index 100% rename from trunk/user/u2ec/pshpack1.h rename to trunk/user/u2ec/src/pshpack1.h diff --git a/trunk/user/u2ec/testusb.c b/trunk/user/u2ec/src/testusb.c similarity index 100% rename from trunk/user/u2ec/testusb.c rename to trunk/user/u2ec/src/testusb.c diff --git a/trunk/user/u2ec/typeconvert.h b/trunk/user/u2ec/src/typeconvert.h similarity index 100% rename from trunk/user/u2ec/typeconvert.h rename to trunk/user/u2ec/src/typeconvert.h diff --git a/trunk/user/u2ec/u2ec_list.h b/trunk/user/u2ec/src/u2ec_list.h similarity index 100% rename from trunk/user/u2ec/u2ec_list.h rename to trunk/user/u2ec/src/u2ec_list.h diff --git a/trunk/user/u2ec/urb.h b/trunk/user/u2ec/src/urb.h similarity index 100% rename from trunk/user/u2ec/urb.h rename to trunk/user/u2ec/src/urb.h diff --git a/trunk/user/u2ec/urb64.h b/trunk/user/u2ec/src/urb64.h similarity index 100% rename from trunk/user/u2ec/urb64.h rename to trunk/user/u2ec/src/urb64.h diff --git a/trunk/user/u2ec/usb.h b/trunk/user/u2ec/src/usb.h similarity index 84% rename from trunk/user/u2ec/usb.h rename to trunk/user/u2ec/src/usb.h index a9516f9f120..b87e130cc2c 100644 --- a/trunk/user/u2ec/usb.h +++ b/trunk/user/u2ec/src/usb.h @@ -29,6 +29,7 @@ #include #include +#include #include #include @@ -80,40 +81,40 @@ /* All standard descriptors have these 2 fields in common */ struct usb_descriptor_header { - u_int8_t bLength; - u_int8_t bDescriptorType; + uint8_t bLength; + uint8_t bDescriptorType; }; /* String descriptor */ struct usb_string_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int16_t wData[1]; + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t wData[1]; }; /* HID descriptor */ struct usb_hid_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int16_t bcdHID; - u_int8_t bCountryCode; - u_int8_t bNumDescriptors; - /* u_int8_t bReportDescriptorType; */ - /* u_int16_t wDescriptorLength; */ + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t bcdHID; + uint8_t bCountryCode; + uint8_t bNumDescriptors; + /* uint8_t bReportDescriptorType; */ + /* uint16_t wDescriptorLength; */ /* ... */ }; /* Endpoint descriptor */ #define USB_MAXENDPOINTS 32 struct usb_endpoint_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int8_t bEndpointAddress; - u_int8_t bmAttributes; - u_int16_t wMaxPacketSize; - u_int8_t bInterval; - u_int8_t bRefresh; - u_int8_t bSynchAddress; + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bEndpointAddress; + uint8_t bmAttributes; + uint16_t wMaxPacketSize; + uint8_t bInterval; + uint8_t bRefresh; + uint8_t bSynchAddress; unsigned char *extra; /* Extra descriptors */ int extralen; @@ -131,15 +132,15 @@ struct usb_endpoint_descriptor { /* Interface descriptor */ #define USB_MAXINTERFACES 32 struct usb_interface_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int8_t bInterfaceNumber; - u_int8_t bAlternateSetting; - u_int8_t bNumEndpoints; - u_int8_t bInterfaceClass; - u_int8_t bInterfaceSubClass; - u_int8_t bInterfaceProtocol; - u_int8_t iInterface; + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bInterfaceNumber; + uint8_t bAlternateSetting; + uint8_t bNumEndpoints; + uint8_t bInterfaceClass; + uint8_t bInterfaceSubClass; + uint8_t bInterfaceProtocol; + uint8_t iInterface; struct usb_endpoint_descriptor *endpoint; @@ -157,14 +158,14 @@ struct usb_interface { /* Configuration descriptor information.. */ #define USB_MAXCONFIG 8 struct usb_config_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int16_t wTotalLength; - u_int8_t bNumInterfaces; - u_int8_t bConfigurationValue; - u_int8_t iConfiguration; - u_int8_t bmAttributes; - u_int8_t MaxPower; + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t wTotalLength; + uint8_t bNumInterfaces; + uint8_t bConfigurationValue; + uint8_t iConfiguration; + uint8_t bmAttributes; + uint8_t MaxPower; struct usb_interface *interface; @@ -174,28 +175,28 @@ struct usb_config_descriptor { /* Device descriptor */ struct usb_device_descriptor { - u_int8_t bLength; - u_int8_t bDescriptorType; - u_int16_t bcdUSB; - u_int8_t bDeviceClass; - u_int8_t bDeviceSubClass; - u_int8_t bDeviceProtocol; - u_int8_t bMaxPacketSize0; - u_int16_t idVendor; - u_int16_t idProduct; - u_int16_t bcdDevice; - u_int8_t iManufacturer; - u_int8_t iProduct; - u_int8_t iSerialNumber; - u_int8_t bNumConfigurations; + uint8_t bLength; + uint8_t bDescriptorType; + uint16_t bcdUSB; + uint8_t bDeviceClass; + uint8_t bDeviceSubClass; + uint8_t bDeviceProtocol; + uint8_t bMaxPacketSize0; + uint16_t idVendor; + uint16_t idProduct; + uint16_t bcdDevice; + uint8_t iManufacturer; + uint8_t iProduct; + uint8_t iSerialNumber; + uint8_t bNumConfigurations; }; struct usb_ctrl_setup { - u_int8_t bRequestType; - u_int8_t bRequest; - u_int16_t wValue; - u_int16_t wIndex; - u_int16_t wLength; + uint8_t bRequestType; + uint8_t bRequest; + uint16_t wValue; + uint16_t wIndex; + uint16_t wLength; }; /* @@ -266,7 +267,7 @@ struct usb_device { void *dev; /* Darwin support */ - u_int8_t devnum; + uint8_t devnum; unsigned char num_children; struct usb_device **children; @@ -278,7 +279,7 @@ struct usb_bus { char dirname[PATH_MAX + 1]; struct usb_device *devices; - u_int32_t location; + uint32_t location; struct usb_device *root_dev; }; diff --git a/trunk/user/u2ec/usb100.h b/trunk/user/u2ec/src/usb100.h similarity index 100% rename from trunk/user/u2ec/usb100.h rename to trunk/user/u2ec/src/usb100.h diff --git a/trunk/user/u2ec/usbdi.h b/trunk/user/u2ec/src/usbdi.h similarity index 100% rename from trunk/user/u2ec/usbdi.h rename to trunk/user/u2ec/src/usbdi.h diff --git a/trunk/user/u2ec/usbioctl.h b/trunk/user/u2ec/src/usbioctl.h similarity index 100% rename from trunk/user/u2ec/usbioctl.h rename to trunk/user/u2ec/src/usbioctl.h diff --git a/trunk/user/u2ec/usbiodef.h b/trunk/user/u2ec/src/usbiodef.h similarity index 100% rename from trunk/user/u2ec/usbiodef.h rename to trunk/user/u2ec/src/usbiodef.h diff --git a/trunk/user/u2ec/usbsock.c b/trunk/user/u2ec/src/usbsock.c similarity index 100% rename from trunk/user/u2ec/usbsock.c rename to trunk/user/u2ec/src/usbsock.c diff --git a/trunk/user/u2ec/usbsock.h b/trunk/user/u2ec/src/usbsock.h similarity index 100% rename from trunk/user/u2ec/usbsock.h rename to trunk/user/u2ec/src/usbsock.h diff --git a/trunk/user/u2ec/wdm-MJMN.h b/trunk/user/u2ec/src/wdm-MJMN.h similarity index 100% rename from trunk/user/u2ec/wdm-MJMN.h rename to trunk/user/u2ec/src/wdm-MJMN.h diff --git a/trunk/user/vsftpd/Makefile b/trunk/user/vsftpd/Makefile index 1c9d336cca7..cf92079c40e 100644 --- a/trunk/user/vsftpd/Makefile +++ b/trunk/user/vsftpd/Makefile @@ -1,42 +1,18 @@ -# Makefile for systems with GNU tools +include $(ROOTDIR)/rules.mk -TOP = $(ROOTDIR)/user +PKG_NAME:=vsftpd -IFLAGS = -idirafter dummyinc +include $(INCLUDE_DIR)/package.mk -CFLAGS += -O2 -Wall -W -Wshadow -Wformat-security -D_FORTIFY_SOURCE=2 -CFLAGS += -I$(TOP)/shared -CFLAGS += -I$(TOP)/libdisk -CFLAGS += -ffunction-sections -fdata-sections +TARGET_CFLAGS += \ + -I$(STAGING_DIR)/include/shared \ + -I$(STAGING_DIR)/include/libdisk -LIBS = #-lcrypt -LINK = -Wl,-s +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -LDFLAGS = -L$(TOP)/libdisk -ldisk -L$(TOP)/shared -lshared -ifeq ($(CONFIG_FIRMWARE_INCLUDE_FTPD_SSL),y) -CFLAGS += -DVSF_BUILD_SSL -LDFLAGS += -L$(STAGEDIR)/lib -lssl -lcrypto -endif -LDFLAGS += -Wl,--gc-sections - -OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ - tunables.o ftpdataio.o secbuf.o ls.o asus_ext.o \ - postprivparent.o logging.o str.o netstr.o sysstr.o strlist.o \ - banner.o filestr.o parseconf.o secutil.o \ - ascii.o oneprocess.o twoprocess.o privops.o standalone.o hash.o \ - tcpwrap.o ipaddrparse.o access.o features.o readwrite.o opts.o \ - ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o \ - seccompsandbox.o - -.c.o: - $(CC) -c $*.c $(CFLAGS) $(IFLAGS) - -vsftpd: $(OBJS) - $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) - -clean: - rm -f *.o *.swp vsftpd +$(eval $(call BuildPackage,vsftpd)) romfs: - mkdir -p $(INSTALLDIR)/usr/share/empty - $(ROMFSINST) /sbin/vsftpd + $(INSTALL_DIR) $(ROMFSDIR)/usr/share/empty + $(INSTALL_DIR) $(ROMFSDIR)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/vsftpd $(ROMFSDIR)/sbin/vsftpd diff --git a/trunk/user/vsftpd/AUDIT b/trunk/user/vsftpd/src/AUDIT similarity index 100% rename from trunk/user/vsftpd/AUDIT rename to trunk/user/vsftpd/src/AUDIT diff --git a/trunk/user/vsftpd/BENCHMARKS b/trunk/user/vsftpd/src/BENCHMARKS similarity index 100% rename from trunk/user/vsftpd/BENCHMARKS rename to trunk/user/vsftpd/src/BENCHMARKS diff --git a/trunk/user/vsftpd/BUGS b/trunk/user/vsftpd/src/BUGS similarity index 100% rename from trunk/user/vsftpd/BUGS rename to trunk/user/vsftpd/src/BUGS diff --git a/trunk/user/vsftpd/COPYING b/trunk/user/vsftpd/src/COPYING similarity index 100% rename from trunk/user/vsftpd/COPYING rename to trunk/user/vsftpd/src/COPYING diff --git a/trunk/user/vsftpd/COPYRIGHT b/trunk/user/vsftpd/src/COPYRIGHT similarity index 100% rename from trunk/user/vsftpd/COPYRIGHT rename to trunk/user/vsftpd/src/COPYRIGHT diff --git a/trunk/user/vsftpd/Changelog b/trunk/user/vsftpd/src/Changelog similarity index 100% rename from trunk/user/vsftpd/Changelog rename to trunk/user/vsftpd/src/Changelog diff --git a/trunk/user/vsftpd/EXAMPLE/INTERNET_SITE/README b/trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/INTERNET_SITE/README rename to trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE/README diff --git a/trunk/user/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf b/trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE/vsftpd.conf similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.conf rename to trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE/vsftpd.conf diff --git a/trunk/user/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd b/trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE/vsftpd.xinetd similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/INTERNET_SITE/vsftpd.xinetd rename to trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE/vsftpd.xinetd diff --git a/trunk/user/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README b/trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE_NOINETD/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/README rename to trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE_NOINETD/README diff --git a/trunk/user/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf b/trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf rename to trunk/user/vsftpd/src/EXAMPLE/INTERNET_SITE_NOINETD/vsftpd.conf diff --git a/trunk/user/vsftpd/EXAMPLE/PER_IP_CONFIG/README b/trunk/user/vsftpd/src/EXAMPLE/PER_IP_CONFIG/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/PER_IP_CONFIG/README rename to trunk/user/vsftpd/src/EXAMPLE/PER_IP_CONFIG/README diff --git a/trunk/user/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow b/trunk/user/vsftpd/src/EXAMPLE/PER_IP_CONFIG/hosts.allow similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/PER_IP_CONFIG/hosts.allow rename to trunk/user/vsftpd/src/EXAMPLE/PER_IP_CONFIG/hosts.allow diff --git a/trunk/user/vsftpd/EXAMPLE/README b/trunk/user/vsftpd/src/EXAMPLE/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/README rename to trunk/user/vsftpd/src/EXAMPLE/README diff --git a/trunk/user/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README b/trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_HOSTS/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/VIRTUAL_HOSTS/README rename to trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_HOSTS/README diff --git a/trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/README b/trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/README rename to trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/README diff --git a/trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt b/trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/logins.txt similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/logins.txt rename to trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/logins.txt diff --git a/trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf b/trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/vsftpd.conf similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.conf rename to trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/vsftpd.conf diff --git a/trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam b/trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/vsftpd.pam similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS/vsftpd.pam rename to trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS/vsftpd.pam diff --git a/trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README b/trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS_2/README similarity index 100% rename from trunk/user/vsftpd/EXAMPLE/VIRTUAL_USERS_2/README rename to trunk/user/vsftpd/src/EXAMPLE/VIRTUAL_USERS_2/README diff --git a/trunk/user/vsftpd/FAQ b/trunk/user/vsftpd/src/FAQ similarity index 100% rename from trunk/user/vsftpd/FAQ rename to trunk/user/vsftpd/src/FAQ diff --git a/trunk/user/vsftpd/INSTALL b/trunk/user/vsftpd/src/INSTALL similarity index 100% rename from trunk/user/vsftpd/INSTALL rename to trunk/user/vsftpd/src/INSTALL diff --git a/trunk/user/vsftpd/LICENSE b/trunk/user/vsftpd/src/LICENSE similarity index 100% rename from trunk/user/vsftpd/LICENSE rename to trunk/user/vsftpd/src/LICENSE diff --git a/trunk/user/vsftpd/src/Makefile b/trunk/user/vsftpd/src/Makefile new file mode 100644 index 00000000000..8c42ac4c4d2 --- /dev/null +++ b/trunk/user/vsftpd/src/Makefile @@ -0,0 +1,31 @@ +# Makefile for systems with GNU tools + +IFLAGS = -idirafter dummyinc + +CFLAGS += -O2 -Wall -W -Wshadow -Wformat-security -D_FORTIFY_SOURCE=2 +CFLAGS += -ffunction-sections -fdata-sections + +LDFLAGS += -ldisk -lshared +ifeq ($(CONFIG_FIRMWARE_INCLUDE_FTPD_SSL),y) +CFLAGS += -DVSF_BUILD_SSL +LDFLAGS += -lssl -lcrypto +endif +LDFLAGS += -Wl,--gc-sections + +OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ + tunables.o ftpdataio.o secbuf.o ls.o asus_ext.o \ + postprivparent.o logging.o str.o netstr.o sysstr.o strlist.o \ + banner.o filestr.o parseconf.o secutil.o \ + ascii.o oneprocess.o twoprocess.o privops.o standalone.o hash.o \ + tcpwrap.o ipaddrparse.o access.o features.o readwrite.o opts.o \ + ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o \ + seccompsandbox.o + +.c.o: + $(CC) -c $*.c $(CFLAGS) $(IFLAGS) + +vsftpd: $(OBJS) + $(CC) -o vsftpd $(OBJS) $(LDFLAGS) + +clean: + rm -f *.o *.swp vsftpd diff --git a/trunk/user/vsftpd/README b/trunk/user/vsftpd/src/README similarity index 100% rename from trunk/user/vsftpd/README rename to trunk/user/vsftpd/src/README diff --git a/trunk/user/vsftpd/README.security b/trunk/user/vsftpd/src/README.security similarity index 100% rename from trunk/user/vsftpd/README.security rename to trunk/user/vsftpd/src/README.security diff --git a/trunk/user/vsftpd/README.ssl b/trunk/user/vsftpd/src/README.ssl similarity index 100% rename from trunk/user/vsftpd/README.ssl rename to trunk/user/vsftpd/src/README.ssl diff --git a/trunk/user/vsftpd/REFS b/trunk/user/vsftpd/src/REFS similarity index 100% rename from trunk/user/vsftpd/REFS rename to trunk/user/vsftpd/src/REFS diff --git a/trunk/user/vsftpd/REWARD b/trunk/user/vsftpd/src/REWARD similarity index 100% rename from trunk/user/vsftpd/REWARD rename to trunk/user/vsftpd/src/REWARD diff --git a/trunk/user/vsftpd/RedHat/README.spec b/trunk/user/vsftpd/src/RedHat/README.spec similarity index 100% rename from trunk/user/vsftpd/RedHat/README.spec rename to trunk/user/vsftpd/src/RedHat/README.spec diff --git a/trunk/user/vsftpd/RedHat/vsftpd.log b/trunk/user/vsftpd/src/RedHat/vsftpd.log similarity index 100% rename from trunk/user/vsftpd/RedHat/vsftpd.log rename to trunk/user/vsftpd/src/RedHat/vsftpd.log diff --git a/trunk/user/vsftpd/RedHat/vsftpd.pam b/trunk/user/vsftpd/src/RedHat/vsftpd.pam similarity index 100% rename from trunk/user/vsftpd/RedHat/vsftpd.pam rename to trunk/user/vsftpd/src/RedHat/vsftpd.pam diff --git a/trunk/user/vsftpd/SECURITY/DESIGN b/trunk/user/vsftpd/src/SECURITY/DESIGN similarity index 100% rename from trunk/user/vsftpd/SECURITY/DESIGN rename to trunk/user/vsftpd/src/SECURITY/DESIGN diff --git a/trunk/user/vsftpd/SECURITY/IMPLEMENTATION b/trunk/user/vsftpd/src/SECURITY/IMPLEMENTATION similarity index 100% rename from trunk/user/vsftpd/SECURITY/IMPLEMENTATION rename to trunk/user/vsftpd/src/SECURITY/IMPLEMENTATION diff --git a/trunk/user/vsftpd/SECURITY/OVERVIEW b/trunk/user/vsftpd/src/SECURITY/OVERVIEW similarity index 100% rename from trunk/user/vsftpd/SECURITY/OVERVIEW rename to trunk/user/vsftpd/src/SECURITY/OVERVIEW diff --git a/trunk/user/vsftpd/SECURITY/TRUST b/trunk/user/vsftpd/src/SECURITY/TRUST similarity index 100% rename from trunk/user/vsftpd/SECURITY/TRUST rename to trunk/user/vsftpd/src/SECURITY/TRUST diff --git a/trunk/user/vsftpd/SIZE b/trunk/user/vsftpd/src/SIZE similarity index 100% rename from trunk/user/vsftpd/SIZE rename to trunk/user/vsftpd/src/SIZE diff --git a/trunk/user/vsftpd/SPEED b/trunk/user/vsftpd/src/SPEED similarity index 100% rename from trunk/user/vsftpd/SPEED rename to trunk/user/vsftpd/src/SPEED diff --git a/trunk/user/vsftpd/TODO b/trunk/user/vsftpd/src/TODO similarity index 100% rename from trunk/user/vsftpd/TODO rename to trunk/user/vsftpd/src/TODO diff --git a/trunk/user/vsftpd/TUNING b/trunk/user/vsftpd/src/TUNING similarity index 100% rename from trunk/user/vsftpd/TUNING rename to trunk/user/vsftpd/src/TUNING diff --git a/trunk/user/vsftpd/access.c b/trunk/user/vsftpd/src/access.c similarity index 100% rename from trunk/user/vsftpd/access.c rename to trunk/user/vsftpd/src/access.c diff --git a/trunk/user/vsftpd/access.h b/trunk/user/vsftpd/src/access.h similarity index 100% rename from trunk/user/vsftpd/access.h rename to trunk/user/vsftpd/src/access.h diff --git a/trunk/user/vsftpd/ascii.c b/trunk/user/vsftpd/src/ascii.c similarity index 100% rename from trunk/user/vsftpd/ascii.c rename to trunk/user/vsftpd/src/ascii.c diff --git a/trunk/user/vsftpd/ascii.h b/trunk/user/vsftpd/src/ascii.h similarity index 100% rename from trunk/user/vsftpd/ascii.h rename to trunk/user/vsftpd/src/ascii.h diff --git a/trunk/user/vsftpd/asus_ext.c b/trunk/user/vsftpd/src/asus_ext.c similarity index 100% rename from trunk/user/vsftpd/asus_ext.c rename to trunk/user/vsftpd/src/asus_ext.c diff --git a/trunk/user/vsftpd/asus_ext.h b/trunk/user/vsftpd/src/asus_ext.h similarity index 100% rename from trunk/user/vsftpd/asus_ext.h rename to trunk/user/vsftpd/src/asus_ext.h diff --git a/trunk/user/vsftpd/banner.c b/trunk/user/vsftpd/src/banner.c similarity index 100% rename from trunk/user/vsftpd/banner.c rename to trunk/user/vsftpd/src/banner.c diff --git a/trunk/user/vsftpd/banner.h b/trunk/user/vsftpd/src/banner.h similarity index 100% rename from trunk/user/vsftpd/banner.h rename to trunk/user/vsftpd/src/banner.h diff --git a/trunk/user/vsftpd/builddefs.h b/trunk/user/vsftpd/src/builddefs.h similarity index 100% rename from trunk/user/vsftpd/builddefs.h rename to trunk/user/vsftpd/src/builddefs.h diff --git a/trunk/user/vsftpd/defs.h b/trunk/user/vsftpd/src/defs.h similarity index 100% rename from trunk/user/vsftpd/defs.h rename to trunk/user/vsftpd/src/defs.h diff --git a/trunk/user/vsftpd/dummyinc/crypt.h b/trunk/user/vsftpd/src/dummyinc/crypt.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/crypt.h rename to trunk/user/vsftpd/src/dummyinc/crypt.h diff --git a/trunk/user/vsftpd/dummyinc/openssl/ssl.h b/trunk/user/vsftpd/src/dummyinc/openssl/ssl.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/openssl/ssl.h rename to trunk/user/vsftpd/src/dummyinc/openssl/ssl.h diff --git a/trunk/user/vsftpd/dummyinc/security/pam_appl.h b/trunk/user/vsftpd/src/dummyinc/security/pam_appl.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/security/pam_appl.h rename to trunk/user/vsftpd/src/dummyinc/security/pam_appl.h diff --git a/trunk/user/vsftpd/dummyinc/shadow.h b/trunk/user/vsftpd/src/dummyinc/shadow.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/shadow.h rename to trunk/user/vsftpd/src/dummyinc/shadow.h diff --git a/trunk/user/vsftpd/dummyinc/sys/capability.h b/trunk/user/vsftpd/src/dummyinc/sys/capability.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/sys/capability.h rename to trunk/user/vsftpd/src/dummyinc/sys/capability.h diff --git a/trunk/user/vsftpd/dummyinc/sys/prctl.h b/trunk/user/vsftpd/src/dummyinc/sys/prctl.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/sys/prctl.h rename to trunk/user/vsftpd/src/dummyinc/sys/prctl.h diff --git a/trunk/user/vsftpd/dummyinc/sys/sendfile.h b/trunk/user/vsftpd/src/dummyinc/sys/sendfile.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/sys/sendfile.h rename to trunk/user/vsftpd/src/dummyinc/sys/sendfile.h diff --git a/trunk/user/vsftpd/dummyinc/utmpx.h b/trunk/user/vsftpd/src/dummyinc/utmpx.h similarity index 100% rename from trunk/user/vsftpd/dummyinc/utmpx.h rename to trunk/user/vsftpd/src/dummyinc/utmpx.h diff --git a/trunk/user/vsftpd/features.c b/trunk/user/vsftpd/src/features.c similarity index 100% rename from trunk/user/vsftpd/features.c rename to trunk/user/vsftpd/src/features.c diff --git a/trunk/user/vsftpd/features.h b/trunk/user/vsftpd/src/features.h similarity index 100% rename from trunk/user/vsftpd/features.h rename to trunk/user/vsftpd/src/features.h diff --git a/trunk/user/vsftpd/filesize.h b/trunk/user/vsftpd/src/filesize.h similarity index 100% rename from trunk/user/vsftpd/filesize.h rename to trunk/user/vsftpd/src/filesize.h diff --git a/trunk/user/vsftpd/filestr.c b/trunk/user/vsftpd/src/filestr.c similarity index 100% rename from trunk/user/vsftpd/filestr.c rename to trunk/user/vsftpd/src/filestr.c diff --git a/trunk/user/vsftpd/filestr.h b/trunk/user/vsftpd/src/filestr.h similarity index 100% rename from trunk/user/vsftpd/filestr.h rename to trunk/user/vsftpd/src/filestr.h diff --git a/trunk/user/vsftpd/ftpcmdio.c b/trunk/user/vsftpd/src/ftpcmdio.c similarity index 100% rename from trunk/user/vsftpd/ftpcmdio.c rename to trunk/user/vsftpd/src/ftpcmdio.c diff --git a/trunk/user/vsftpd/ftpcmdio.h b/trunk/user/vsftpd/src/ftpcmdio.h similarity index 100% rename from trunk/user/vsftpd/ftpcmdio.h rename to trunk/user/vsftpd/src/ftpcmdio.h diff --git a/trunk/user/vsftpd/ftpcodes.h b/trunk/user/vsftpd/src/ftpcodes.h similarity index 100% rename from trunk/user/vsftpd/ftpcodes.h rename to trunk/user/vsftpd/src/ftpcodes.h diff --git a/trunk/user/vsftpd/ftpdataio.c b/trunk/user/vsftpd/src/ftpdataio.c similarity index 100% rename from trunk/user/vsftpd/ftpdataio.c rename to trunk/user/vsftpd/src/ftpdataio.c diff --git a/trunk/user/vsftpd/ftpdataio.h b/trunk/user/vsftpd/src/ftpdataio.h similarity index 100% rename from trunk/user/vsftpd/ftpdataio.h rename to trunk/user/vsftpd/src/ftpdataio.h diff --git a/trunk/user/vsftpd/ftppolicy.c b/trunk/user/vsftpd/src/ftppolicy.c similarity index 100% rename from trunk/user/vsftpd/ftppolicy.c rename to trunk/user/vsftpd/src/ftppolicy.c diff --git a/trunk/user/vsftpd/ftppolicy.h b/trunk/user/vsftpd/src/ftppolicy.h similarity index 100% rename from trunk/user/vsftpd/ftppolicy.h rename to trunk/user/vsftpd/src/ftppolicy.h diff --git a/trunk/user/vsftpd/hash.c b/trunk/user/vsftpd/src/hash.c similarity index 100% rename from trunk/user/vsftpd/hash.c rename to trunk/user/vsftpd/src/hash.c diff --git a/trunk/user/vsftpd/hash.h b/trunk/user/vsftpd/src/hash.h similarity index 100% rename from trunk/user/vsftpd/hash.h rename to trunk/user/vsftpd/src/hash.h diff --git a/trunk/user/vsftpd/ipaddrparse.c b/trunk/user/vsftpd/src/ipaddrparse.c similarity index 100% rename from trunk/user/vsftpd/ipaddrparse.c rename to trunk/user/vsftpd/src/ipaddrparse.c diff --git a/trunk/user/vsftpd/ipaddrparse.h b/trunk/user/vsftpd/src/ipaddrparse.h similarity index 100% rename from trunk/user/vsftpd/ipaddrparse.h rename to trunk/user/vsftpd/src/ipaddrparse.h diff --git a/trunk/user/vsftpd/logging.c b/trunk/user/vsftpd/src/logging.c similarity index 100% rename from trunk/user/vsftpd/logging.c rename to trunk/user/vsftpd/src/logging.c diff --git a/trunk/user/vsftpd/logging.h b/trunk/user/vsftpd/src/logging.h similarity index 100% rename from trunk/user/vsftpd/logging.h rename to trunk/user/vsftpd/src/logging.h diff --git a/trunk/user/vsftpd/ls.c b/trunk/user/vsftpd/src/ls.c similarity index 100% rename from trunk/user/vsftpd/ls.c rename to trunk/user/vsftpd/src/ls.c diff --git a/trunk/user/vsftpd/ls.h b/trunk/user/vsftpd/src/ls.h similarity index 100% rename from trunk/user/vsftpd/ls.h rename to trunk/user/vsftpd/src/ls.h diff --git a/trunk/user/vsftpd/main.c b/trunk/user/vsftpd/src/main.c similarity index 100% rename from trunk/user/vsftpd/main.c rename to trunk/user/vsftpd/src/main.c diff --git a/trunk/user/vsftpd/netstr.c b/trunk/user/vsftpd/src/netstr.c similarity index 100% rename from trunk/user/vsftpd/netstr.c rename to trunk/user/vsftpd/src/netstr.c diff --git a/trunk/user/vsftpd/netstr.h b/trunk/user/vsftpd/src/netstr.h similarity index 100% rename from trunk/user/vsftpd/netstr.h rename to trunk/user/vsftpd/src/netstr.h diff --git a/trunk/user/vsftpd/oneprocess.c b/trunk/user/vsftpd/src/oneprocess.c similarity index 100% rename from trunk/user/vsftpd/oneprocess.c rename to trunk/user/vsftpd/src/oneprocess.c diff --git a/trunk/user/vsftpd/oneprocess.h b/trunk/user/vsftpd/src/oneprocess.h similarity index 100% rename from trunk/user/vsftpd/oneprocess.h rename to trunk/user/vsftpd/src/oneprocess.h diff --git a/trunk/user/vsftpd/opts.c b/trunk/user/vsftpd/src/opts.c similarity index 100% rename from trunk/user/vsftpd/opts.c rename to trunk/user/vsftpd/src/opts.c diff --git a/trunk/user/vsftpd/opts.h b/trunk/user/vsftpd/src/opts.h similarity index 100% rename from trunk/user/vsftpd/opts.h rename to trunk/user/vsftpd/src/opts.h diff --git a/trunk/user/vsftpd/parseconf.c b/trunk/user/vsftpd/src/parseconf.c similarity index 100% rename from trunk/user/vsftpd/parseconf.c rename to trunk/user/vsftpd/src/parseconf.c diff --git a/trunk/user/vsftpd/parseconf.h b/trunk/user/vsftpd/src/parseconf.h similarity index 100% rename from trunk/user/vsftpd/parseconf.h rename to trunk/user/vsftpd/src/parseconf.h diff --git a/trunk/user/vsftpd/port/aix_bogons.h b/trunk/user/vsftpd/src/port/aix_bogons.h similarity index 100% rename from trunk/user/vsftpd/port/aix_bogons.h rename to trunk/user/vsftpd/src/port/aix_bogons.h diff --git a/trunk/user/vsftpd/port/cmsg_extras.h b/trunk/user/vsftpd/src/port/cmsg_extras.h similarity index 100% rename from trunk/user/vsftpd/port/cmsg_extras.h rename to trunk/user/vsftpd/src/port/cmsg_extras.h diff --git a/trunk/user/vsftpd/port/dirfd_extras.h b/trunk/user/vsftpd/src/port/dirfd_extras.h similarity index 100% rename from trunk/user/vsftpd/port/dirfd_extras.h rename to trunk/user/vsftpd/src/port/dirfd_extras.h diff --git a/trunk/user/vsftpd/port/hpux_bogons.h b/trunk/user/vsftpd/src/port/hpux_bogons.h similarity index 100% rename from trunk/user/vsftpd/port/hpux_bogons.h rename to trunk/user/vsftpd/src/port/hpux_bogons.h diff --git a/trunk/user/vsftpd/port/irix_bogons.h b/trunk/user/vsftpd/src/port/irix_bogons.h similarity index 100% rename from trunk/user/vsftpd/port/irix_bogons.h rename to trunk/user/vsftpd/src/port/irix_bogons.h diff --git a/trunk/user/vsftpd/port/porting_junk.h b/trunk/user/vsftpd/src/port/porting_junk.h similarity index 100% rename from trunk/user/vsftpd/port/porting_junk.h rename to trunk/user/vsftpd/src/port/porting_junk.h diff --git a/trunk/user/vsftpd/port/solaris_bogons.h b/trunk/user/vsftpd/src/port/solaris_bogons.h similarity index 100% rename from trunk/user/vsftpd/port/solaris_bogons.h rename to trunk/user/vsftpd/src/port/solaris_bogons.h diff --git a/trunk/user/vsftpd/port/tru64_bogons.h b/trunk/user/vsftpd/src/port/tru64_bogons.h similarity index 100% rename from trunk/user/vsftpd/port/tru64_bogons.h rename to trunk/user/vsftpd/src/port/tru64_bogons.h diff --git a/trunk/user/vsftpd/postlogin.c b/trunk/user/vsftpd/src/postlogin.c similarity index 100% rename from trunk/user/vsftpd/postlogin.c rename to trunk/user/vsftpd/src/postlogin.c diff --git a/trunk/user/vsftpd/postlogin.h b/trunk/user/vsftpd/src/postlogin.h similarity index 100% rename from trunk/user/vsftpd/postlogin.h rename to trunk/user/vsftpd/src/postlogin.h diff --git a/trunk/user/vsftpd/postprivparent.c b/trunk/user/vsftpd/src/postprivparent.c similarity index 100% rename from trunk/user/vsftpd/postprivparent.c rename to trunk/user/vsftpd/src/postprivparent.c diff --git a/trunk/user/vsftpd/postprivparent.h b/trunk/user/vsftpd/src/postprivparent.h similarity index 100% rename from trunk/user/vsftpd/postprivparent.h rename to trunk/user/vsftpd/src/postprivparent.h diff --git a/trunk/user/vsftpd/prelogin.c b/trunk/user/vsftpd/src/prelogin.c similarity index 100% rename from trunk/user/vsftpd/prelogin.c rename to trunk/user/vsftpd/src/prelogin.c diff --git a/trunk/user/vsftpd/prelogin.h b/trunk/user/vsftpd/src/prelogin.h similarity index 100% rename from trunk/user/vsftpd/prelogin.h rename to trunk/user/vsftpd/src/prelogin.h diff --git a/trunk/user/vsftpd/privops.c b/trunk/user/vsftpd/src/privops.c similarity index 100% rename from trunk/user/vsftpd/privops.c rename to trunk/user/vsftpd/src/privops.c diff --git a/trunk/user/vsftpd/privops.h b/trunk/user/vsftpd/src/privops.h similarity index 100% rename from trunk/user/vsftpd/privops.h rename to trunk/user/vsftpd/src/privops.h diff --git a/trunk/user/vsftpd/privsock.c b/trunk/user/vsftpd/src/privsock.c similarity index 100% rename from trunk/user/vsftpd/privsock.c rename to trunk/user/vsftpd/src/privsock.c diff --git a/trunk/user/vsftpd/privsock.h b/trunk/user/vsftpd/src/privsock.h similarity index 100% rename from trunk/user/vsftpd/privsock.h rename to trunk/user/vsftpd/src/privsock.h diff --git a/trunk/user/vsftpd/ptracesandbox.c b/trunk/user/vsftpd/src/ptracesandbox.c similarity index 100% rename from trunk/user/vsftpd/ptracesandbox.c rename to trunk/user/vsftpd/src/ptracesandbox.c diff --git a/trunk/user/vsftpd/ptracesandbox.h b/trunk/user/vsftpd/src/ptracesandbox.h similarity index 100% rename from trunk/user/vsftpd/ptracesandbox.h rename to trunk/user/vsftpd/src/ptracesandbox.h diff --git a/trunk/user/vsftpd/readwrite.c b/trunk/user/vsftpd/src/readwrite.c similarity index 100% rename from trunk/user/vsftpd/readwrite.c rename to trunk/user/vsftpd/src/readwrite.c diff --git a/trunk/user/vsftpd/readwrite.h b/trunk/user/vsftpd/src/readwrite.h similarity index 100% rename from trunk/user/vsftpd/readwrite.h rename to trunk/user/vsftpd/src/readwrite.h diff --git a/trunk/user/vsftpd/secbuf.c b/trunk/user/vsftpd/src/secbuf.c similarity index 100% rename from trunk/user/vsftpd/secbuf.c rename to trunk/user/vsftpd/src/secbuf.c diff --git a/trunk/user/vsftpd/secbuf.h b/trunk/user/vsftpd/src/secbuf.h similarity index 100% rename from trunk/user/vsftpd/secbuf.h rename to trunk/user/vsftpd/src/secbuf.h diff --git a/trunk/user/vsftpd/seccompsandbox.c b/trunk/user/vsftpd/src/seccompsandbox.c similarity index 100% rename from trunk/user/vsftpd/seccompsandbox.c rename to trunk/user/vsftpd/src/seccompsandbox.c diff --git a/trunk/user/vsftpd/seccompsandbox.h b/trunk/user/vsftpd/src/seccompsandbox.h similarity index 100% rename from trunk/user/vsftpd/seccompsandbox.h rename to trunk/user/vsftpd/src/seccompsandbox.h diff --git a/trunk/user/vsftpd/secutil.c b/trunk/user/vsftpd/src/secutil.c similarity index 100% rename from trunk/user/vsftpd/secutil.c rename to trunk/user/vsftpd/src/secutil.c diff --git a/trunk/user/vsftpd/secutil.h b/trunk/user/vsftpd/src/secutil.h similarity index 100% rename from trunk/user/vsftpd/secutil.h rename to trunk/user/vsftpd/src/secutil.h diff --git a/trunk/user/vsftpd/session.h b/trunk/user/vsftpd/src/session.h similarity index 100% rename from trunk/user/vsftpd/session.h rename to trunk/user/vsftpd/src/session.h diff --git a/trunk/user/vsftpd/ssl.c b/trunk/user/vsftpd/src/ssl.c similarity index 100% rename from trunk/user/vsftpd/ssl.c rename to trunk/user/vsftpd/src/ssl.c diff --git a/trunk/user/vsftpd/ssl.h b/trunk/user/vsftpd/src/ssl.h similarity index 100% rename from trunk/user/vsftpd/ssl.h rename to trunk/user/vsftpd/src/ssl.h diff --git a/trunk/user/vsftpd/sslslave.c b/trunk/user/vsftpd/src/sslslave.c similarity index 100% rename from trunk/user/vsftpd/sslslave.c rename to trunk/user/vsftpd/src/sslslave.c diff --git a/trunk/user/vsftpd/sslslave.h b/trunk/user/vsftpd/src/sslslave.h similarity index 100% rename from trunk/user/vsftpd/sslslave.h rename to trunk/user/vsftpd/src/sslslave.h diff --git a/trunk/user/vsftpd/standalone.c b/trunk/user/vsftpd/src/standalone.c similarity index 100% rename from trunk/user/vsftpd/standalone.c rename to trunk/user/vsftpd/src/standalone.c diff --git a/trunk/user/vsftpd/standalone.h b/trunk/user/vsftpd/src/standalone.h similarity index 100% rename from trunk/user/vsftpd/standalone.h rename to trunk/user/vsftpd/src/standalone.h diff --git a/trunk/user/vsftpd/str.c b/trunk/user/vsftpd/src/str.c similarity index 100% rename from trunk/user/vsftpd/str.c rename to trunk/user/vsftpd/src/str.c diff --git a/trunk/user/vsftpd/str.h b/trunk/user/vsftpd/src/str.h similarity index 100% rename from trunk/user/vsftpd/str.h rename to trunk/user/vsftpd/src/str.h diff --git a/trunk/user/vsftpd/strlist.c b/trunk/user/vsftpd/src/strlist.c similarity index 100% rename from trunk/user/vsftpd/strlist.c rename to trunk/user/vsftpd/src/strlist.c diff --git a/trunk/user/vsftpd/strlist.h b/trunk/user/vsftpd/src/strlist.h similarity index 100% rename from trunk/user/vsftpd/strlist.h rename to trunk/user/vsftpd/src/strlist.h diff --git a/trunk/user/vsftpd/sysdeputil.c b/trunk/user/vsftpd/src/sysdeputil.c similarity index 100% rename from trunk/user/vsftpd/sysdeputil.c rename to trunk/user/vsftpd/src/sysdeputil.c diff --git a/trunk/user/vsftpd/sysdeputil.h b/trunk/user/vsftpd/src/sysdeputil.h similarity index 100% rename from trunk/user/vsftpd/sysdeputil.h rename to trunk/user/vsftpd/src/sysdeputil.h diff --git a/trunk/user/vsftpd/sysstr.c b/trunk/user/vsftpd/src/sysstr.c similarity index 100% rename from trunk/user/vsftpd/sysstr.c rename to trunk/user/vsftpd/src/sysstr.c diff --git a/trunk/user/vsftpd/sysstr.h b/trunk/user/vsftpd/src/sysstr.h similarity index 100% rename from trunk/user/vsftpd/sysstr.h rename to trunk/user/vsftpd/src/sysstr.h diff --git a/trunk/user/vsftpd/sysutil.c b/trunk/user/vsftpd/src/sysutil.c similarity index 100% rename from trunk/user/vsftpd/sysutil.c rename to trunk/user/vsftpd/src/sysutil.c diff --git a/trunk/user/vsftpd/sysutil.h b/trunk/user/vsftpd/src/sysutil.h similarity index 100% rename from trunk/user/vsftpd/sysutil.h rename to trunk/user/vsftpd/src/sysutil.h diff --git a/trunk/user/vsftpd/tcpwrap.c b/trunk/user/vsftpd/src/tcpwrap.c similarity index 100% rename from trunk/user/vsftpd/tcpwrap.c rename to trunk/user/vsftpd/src/tcpwrap.c diff --git a/trunk/user/vsftpd/tcpwrap.h b/trunk/user/vsftpd/src/tcpwrap.h similarity index 100% rename from trunk/user/vsftpd/tcpwrap.h rename to trunk/user/vsftpd/src/tcpwrap.h diff --git a/trunk/user/vsftpd/tunables.c b/trunk/user/vsftpd/src/tunables.c similarity index 100% rename from trunk/user/vsftpd/tunables.c rename to trunk/user/vsftpd/src/tunables.c diff --git a/trunk/user/vsftpd/tunables.h b/trunk/user/vsftpd/src/tunables.h similarity index 100% rename from trunk/user/vsftpd/tunables.h rename to trunk/user/vsftpd/src/tunables.h diff --git a/trunk/user/vsftpd/twoprocess.c b/trunk/user/vsftpd/src/twoprocess.c similarity index 100% rename from trunk/user/vsftpd/twoprocess.c rename to trunk/user/vsftpd/src/twoprocess.c diff --git a/trunk/user/vsftpd/twoprocess.h b/trunk/user/vsftpd/src/twoprocess.h similarity index 100% rename from trunk/user/vsftpd/twoprocess.h rename to trunk/user/vsftpd/src/twoprocess.h diff --git a/trunk/user/vsftpd/utility.c b/trunk/user/vsftpd/src/utility.c similarity index 100% rename from trunk/user/vsftpd/utility.c rename to trunk/user/vsftpd/src/utility.c diff --git a/trunk/user/vsftpd/utility.h b/trunk/user/vsftpd/src/utility.h similarity index 100% rename from trunk/user/vsftpd/utility.h rename to trunk/user/vsftpd/src/utility.h diff --git a/trunk/user/vsftpd/vsf_findlibs.sh b/trunk/user/vsftpd/src/vsf_findlibs.sh similarity index 100% rename from trunk/user/vsftpd/vsf_findlibs.sh rename to trunk/user/vsftpd/src/vsf_findlibs.sh diff --git a/trunk/user/vsftpd/vsftpd.8 b/trunk/user/vsftpd/src/vsftpd.8 similarity index 100% rename from trunk/user/vsftpd/vsftpd.8 rename to trunk/user/vsftpd/src/vsftpd.8 diff --git a/trunk/user/vsftpd/vsftpd.conf b/trunk/user/vsftpd/src/vsftpd.conf similarity index 100% rename from trunk/user/vsftpd/vsftpd.conf rename to trunk/user/vsftpd/src/vsftpd.conf diff --git a/trunk/user/vsftpd/vsftpd.conf.5 b/trunk/user/vsftpd/src/vsftpd.conf.5 similarity index 100% rename from trunk/user/vsftpd/vsftpd.conf.5 rename to trunk/user/vsftpd/src/vsftpd.conf.5 diff --git a/trunk/user/vsftpd/vsftpver.h b/trunk/user/vsftpd/src/vsftpver.h similarity index 100% rename from trunk/user/vsftpd/vsftpver.h rename to trunk/user/vsftpd/src/vsftpver.h diff --git a/trunk/user/vsftpd/xinetd.d/vsftpd b/trunk/user/vsftpd/xinetd.d/vsftpd deleted file mode 100644 index baf95d5351e..00000000000 --- a/trunk/user/vsftpd/xinetd.d/vsftpd +++ /dev/null @@ -1,18 +0,0 @@ -# default: on -# description: -# The vsftpd FTP server serves FTP connections. It uses -# normal, unencrypted usernames and passwords for authentication. -# vsftpd is designed to be secure. -service ftp -{ - socket_type = stream - wait = no - user = root - server = /usr/local/sbin/vsftpd -# server_args = -# log_on_success += DURATION USERID -# log_on_failure += USERID - nice = 10 - disable = no -} - diff --git a/trunk/user/wsdd2/Makefile b/trunk/user/wsdd2/Makefile index 8ff028903cd..ed5ee31935f 100644 --- a/trunk/user/wsdd2/Makefile +++ b/trunk/user/wsdd2/Makefile @@ -1,22 +1,14 @@ -ifndef ROOTDIR -ROOTDIR=../.. -endif +include $(ROOTDIR)/rules.mk -CFLAGS += -ffunction-sections -fdata-sections -fvisibility=hidden -LDFLAGS += -Wl,--gc-sections +PKG_NAME:=wsdd2 -SHDIR = $(ROOTDIR)/user/shared -CFLAGS += -I$(SHDIR) -LDFLAGS += -L$(SHDIR) -lshared +include $(INCLUDE_DIR)/package.mk -all: - $(CC) $(CFLAGS) $(LDFLAGS) wsdd2.c wsd.c llmnr.c -o wsdd2 +TARGET_CFLAGS += -I$(STAGING_DIR)/include/shared +TARGET_LDFLAGS += -L$(STAGING_DIR)/lib -install: - -clean: - rm -f wsdd2 +$(eval $(call BuildPackage,wsdd2)) romfs: - $(ROMFSINST) wsdd2 /sbin/wsdd2 - + $(INSTALL_DIR) $(ROMFSDIR)/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wsdd2 $(ROMFSDIR)/sbin/wsdd2 diff --git a/trunk/user/wsdd2/src/Makefile b/trunk/user/wsdd2/src/Makefile new file mode 100644 index 00000000000..c50737cf989 --- /dev/null +++ b/trunk/user/wsdd2/src/Makefile @@ -0,0 +1,13 @@ +LDFLAGS += -lshared + +all: + $(CC) $(CFLAGS) $(LDFLAGS) wsdd2.c wsd.c llmnr.c -o wsdd2 + +install: + +clean: + rm -f wsdd2 + +romfs: + $(ROMFSINST) wsdd2 /sbin/wsdd2 + diff --git a/trunk/user/wsdd2/llmnr.c b/trunk/user/wsdd2/src/llmnr.c similarity index 100% rename from trunk/user/wsdd2/llmnr.c rename to trunk/user/wsdd2/src/llmnr.c diff --git a/trunk/user/wsdd2/wsd.c b/trunk/user/wsdd2/src/wsd.c similarity index 100% rename from trunk/user/wsdd2/wsd.c rename to trunk/user/wsdd2/src/wsd.c diff --git a/trunk/user/wsdd2/wsd.h b/trunk/user/wsdd2/src/wsd.h similarity index 100% rename from trunk/user/wsdd2/wsd.h rename to trunk/user/wsdd2/src/wsd.h diff --git a/trunk/user/wsdd2/wsdd.h b/trunk/user/wsdd2/src/wsdd.h similarity index 100% rename from trunk/user/wsdd2/wsdd.h rename to trunk/user/wsdd2/src/wsdd.h diff --git a/trunk/user/wsdd2/wsdd2.c b/trunk/user/wsdd2/src/wsdd2.c similarity index 100% rename from trunk/user/wsdd2/wsdd2.c rename to trunk/user/wsdd2/src/wsdd2.c diff --git a/trunk/user/www/Makefile b/trunk/user/www/Makefile index 6e37213cbbf..0ecb57e0f58 100644 --- a/trunk/user/www/Makefile +++ b/trunk/user/www/Makefile @@ -4,7 +4,7 @@ endif ROMFS_DIR = $(ROOTDIR)/romfs -include $(ROOTDIR)/user/shared/boards.mk +include $(BOARD_CONFIG) PROJECT_HOME_URL="https:\/\/bitbucket.org\/padavan\/rt-n56u\/" PROJECT_HOME_URL_MOD="https:\/\/github.com\/tsl0922\/padavan\/"