Removed duplicate -I tags from CFLAGS

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 9c8fe51d4efe4ccd0469909c713327cf668ba629..240485b812b2e113eff7e4898a78292584855825 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -9,7 +9,7 @@ afpd_LDADD = $(top_srcdir)/libatalk/libatalk.a -latalk
 
 noinst_HEADERS = auth.h codepage.h afp_config.h desktop.h directory.h file.h filedir.h fork.h globals.h icon.h misc.h status.h switch.h uam_auth.h unix.h volume.h
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+CFLAGS = @CFLAGS@ \
         -D_PATH_AFPDDEFVOL=\"$(CONFIG_DIR)/AppleVolumes.default\" \
         -D_PATH_AFPDSYSVOL=\"$(CONFIG_DIR)/AppleVolumes.system\" \
         -D_PATH_AFPDPWFILE=\"$(CONFIG_DIR)/afppasswd\" \

diff --git a/etc/atalkd/Makefile.am b/etc/atalkd/Makefile.am
index e718f29536575906e1a552633f0ec3e7298e8908..4d2a6ad670ca94aac38b62b8767de418ab7a03b1 100644 (file)
--- a/etc/atalkd/Makefile.am
+++ b/etc/atalkd/Makefile.am
@@ -7,6 +7,4 @@ atalkd_LDADD = -L$(top_srcdir)/libatalk -latalk
 
 noinst_HEADERS = atserv.h gate.h interface.h list.h multicast.h nbp.h rtmp.h zip.h
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-       -D_PATH_ATALKDCONF=\"$(CONFIG_DIR)/atalkd.conf\" \
-       -DVERSION=\"$(NETATALK_VERSION)\"
+CFLAGS = @CFLAGS@ -D_PATH_ATALKDCONF=\"$(CONFIG_DIR)/atalkd.conf\"

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index 81a6ccf3e0fb60a6a1c0e9418a445533575e4712..cd7449d21564ace225ef51200e5d67a9f5222a25 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -1,13 +1,16 @@
 # Makefile.am for etc/papd/
 
 sbin_PROGRAMS = papd
+#bin_PROGRAMS = showppd
 
 papd_SOURCES = main.c printcap.c session.c file.c comment.c lp.c ppd.c magics.c headers.c queries.c auth.c uam.c
 papd_LDADD = $(top_srcdir)/libatalk/libatalk.a -latalk
 
+#showppd_SOURCES = showppd.c ppd.c
+#showppd_LDADD = $(top_srcdir)/libatalk/libatalk.a -latalk
+
 noinst_HEADERS = comment.h file.h ppd.h printer.h uam_auth.h
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
+CFLAGS = @CFLAGS@ \
        -D_PATH_PAPDCONF=\"$(CONFIG_DIR)/papd.conf\" \
-       -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\" \
-       -DVERSION=\"$(NETATALK_VERSION)\"
+       -D_PATH_PAPDUAMPATH=\"$(UAMS_PATH)/\"

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index b04454a6b0dda8e5232cca2853ddc4e4fa9d9ebe..675bb1c91a84e0bd49607bf875533d16b8c9c04f 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -5,14 +5,12 @@ sbin_PROGRAMS = psf psa
 psf_SOURCES = psf.c
 psa_SOURCES = psa.c
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-       -DZEROWIDTH \
+CFLAGS = @CFLAGS@ -DZEROWIDTH \
        -D_PATH_PAP=\"$(bindir)/pap\" \
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
        -D_PATH_PSA=\"$(sbindir)/psa\" \
        -D_PATH_PSFILTER=\"$(bindir)/etc2ps.sh\" \
-       -D_PATH_PAGECOUNT=\"$(CONFIG_DIR)/pagecount.ps\" \
-       -DVERSION=\"$(NETATALK_VERSION)\"
+       -D_PATH_PAGECOUNT=\"$(CONFIG_DIR)/pagecount.ps\"
 
 # how to do symbolic links to psf???
 # LINKS = ofpap ifpap tfpap ifpaprev tfpaprev ofwpap ifwpap tfwpap ifwpaprev tfwpaprev ofmpap ifmpap tfmpap ifmpaprev tfmpaprev ofwmpap ifwmpap tfwmpap ifwmpaprev tfwmpaprev

diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
index ca0a2b2796cee86cc653a959da68899ca2134599..9f9ca5862a55b9a7ed47578a1adfd74da9f741a8 100644 (file)
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -3,15 +3,15 @@
 #SUBDIRS = uams_krb4
 
 uamsdir = $(UAMS_PATH)
-uams_LTLIBRARIES = lib_uams_dhx_pam.la lib_uams_dhx.passwd.la lib_uams_guest.la lib_uams_pam.la lib_uams_randnum.la
+uams_LTLIBRARIES = lib_uams_dhx_pam.la lib_uams_dhx.passwd.la lib_uams_guest.la lib_uams_pam.la lib_uams_passwd.la lib_uams_randnum.la
 # removed lib_uams_pgp.la since it doesn't currently build (AFAIK)
 
 lib_uams_dhx_pam_la_SOURCES = uams_dhx_pam.c
 lib_uams_dhx_passwd_la_SOURCES = uams_dhx_passwd.c
 lib_uams_guest_la_SOURCES = uams_guest.c
 lib_uams_pam_la_SOURCES = uams_pam.c
+lib_uams_passwd_la_SOURCES = uams_passwd.c
 #lib_uams_pgp_la_SOURCES = uams_pgp.c
 lib_uams_randnum_la_SOURCES = uams_randnum.c
 
-CFLAGS = @CFLAGS@ -I$(top_srcdir)/include -I$(top_srcdir)/sys \
-       -DUAM_RNDNUM
+CFLAGS = @CFLAGS@ -DUAM_RNDNUM