diff options
Diffstat (limited to 'usr/src/cmd/hal')
| -rw-r--r-- | usr/src/cmd/hal/addons/acpi/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/addons/cpufreq/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/addons/network-devices/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/addons/storage/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/hald-runner/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/hald/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/hald/solaris/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/probing/acpi/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/probing/network-printer/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/probing/printer/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/probing/storage/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/probing/volume/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/cmd/hal/probing/xkb/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/tools/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/cmd/hal/tools/sunos/Makefile | 4 |
15 files changed, 15 insertions, 31 deletions
diff --git a/usr/src/cmd/hal/addons/acpi/Makefile b/usr/src/cmd/hal/addons/acpi/Makefile index daf306a758..e66764495c 100644 --- a/usr/src/cmd/hal/addons/acpi/Makefile +++ b/usr/src/cmd/hal/addons/acpi/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-addon-acpi OBJS = addon-acpi.o logger.o util_helper.o acpi.o util_pm.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/cpufreq/Makefile b/usr/src/cmd/hal/addons/cpufreq/Makefile index b631fbf33b..1fdf1ad83c 100644 --- a/usr/src/cmd/hal/addons/cpufreq/Makefile +++ b/usr/src/cmd/hal/addons/cpufreq/Makefile @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#pragma ident "%Z%%M% %I% %E% SMI" -# PROG = hald-addon-cpufreq OBJS = addon-cpufreq.o logger.o adt_data.o @@ -40,7 +38,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 -ldbus-glib-1 -lpolkit -lbsm CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -g -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/network-devices/Makefile b/usr/src/cmd/hal/addons/network-devices/Makefile index 4d29e23981..3ac146e39e 100644 --- a/usr/src/cmd/hal/addons/network-devices/Makefile +++ b/usr/src/cmd/hal/addons/network-devices/Makefile @@ -45,7 +45,7 @@ LDLIBS += $(ZIGNORE) -lnetsnmp CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -I../../utils -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/addons/storage/Makefile b/usr/src/cmd/hal/addons/storage/Makefile index e7d4797dc9..f5aa0fbbf5 100644 --- a/usr/src/cmd/hal/addons/storage/Makefile +++ b/usr/src/cmd/hal/addons/storage/Makefile @@ -36,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lnvpair -lsysevent CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/hald-runner/Makefile b/usr/src/cmd/hal/hald-runner/Makefile index f52bb65346..9f283d9468 100644 --- a/usr/src/cmd/hal/hald-runner/Makefile +++ b/usr/src/cmd/hal/hald-runner/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-runner OBJS = main.o runner.o utils.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -ldbus-glib-1 -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -UDBUS_API_SUBJECT_TO_CHANGE -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/hald/Makefile b/usr/src/cmd/hal/hald/Makefile index 9352dd5e56..e61790e3e5 100644 --- a/usr/src/cmd/hal/hald/Makefile +++ b/usr/src/cmd/hal/hald/Makefile @@ -46,7 +46,7 @@ LDLIBS += -lc -lm -ldbus-1 -ldbus-glib-1 -lglib-2.0 -lgobject-2.0 \ all install $(PROG) := LDLIBS += -lexpat CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) CLOBBERFILES += hald_marshal.c hald_marshal.h diff --git a/usr/src/cmd/hal/hald/solaris/Makefile b/usr/src/cmd/hal/hald/solaris/Makefile index f4513b315b..b7e0d59252 100644 --- a/usr/src/cmd/hal/hald/solaris/Makefile +++ b/usr/src/cmd/hal/hald/solaris/Makefile @@ -40,7 +40,7 @@ $(ROOTMANIFEST) := FILEMODE = 444 $(ROOTLIBSVCMETHOD)/svc-hal:= FILEMODE = 555 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/acpi/Makefile b/usr/src/cmd/hal/probing/acpi/Makefile index 2bfd38d014..69190994c3 100644 --- a/usr/src/cmd/hal/probing/acpi/Makefile +++ b/usr/src/cmd/hal/probing/acpi/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-acpi OBJS = probe-acpi.o logger.o acpi.o util_pm.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/network-printer/Makefile b/usr/src/cmd/hal/probing/network-printer/Makefile index 80c2e6d034..f2227ec9e8 100644 --- a/usr/src/cmd/hal/probing/network-printer/Makefile +++ b/usr/src/cmd/hal/probing/network-printer/Makefile @@ -38,7 +38,7 @@ LDLIBS += $(ZIGNORE) -lnetsnmp CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/printer/Makefile b/usr/src/cmd/hal/probing/printer/Makefile index 26903c5959..9954375a62 100644 --- a/usr/src/cmd/hal/probing/printer/Makefile +++ b/usr/src/cmd/hal/probing/printer/Makefile @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-printer OBJS = probe-printer.o logger.o printer.o @@ -38,7 +36,7 @@ LDLIBS += -lc -ldbus-1 -lhal CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/storage/Makefile b/usr/src/cmd/hal/probing/storage/Makefile index 76450e1743..8b886d4c07 100644 --- a/usr/src/cmd/hal/probing/storage/Makefile +++ b/usr/src/cmd/hal/probing/storage/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-storage OBJS = probe-storage.o cdutils.o fsutils.o logger.o @@ -39,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal -ladm -lefi CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/volume/Makefile b/usr/src/cmd/hal/probing/volume/Makefile index a9cd36186b..25ee9ea016 100644 --- a/usr/src/cmd/hal/probing/volume/Makefile +++ b/usr/src/cmd/hal/probing/volume/Makefile @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG = hald-probe-volume OBJS = probe-volume.o cdutils.o fsutils.o logger.o @@ -39,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal -lfstyp -lnvpair -ladm -lefi CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../utils -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/probing/xkb/Makefile b/usr/src/cmd/hal/probing/xkb/Makefile index 1db618779c..8d6b1fc13c 100644 --- a/usr/src/cmd/hal/probing/xkb/Makefile +++ b/usr/src/cmd/hal/probing/xkb/Makefile @@ -37,7 +37,7 @@ LDLIBS += -lc -ldbus-1 -lhal CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal -I../../hald -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) .KEEP_STATE: diff --git a/usr/src/cmd/hal/tools/Makefile b/usr/src/cmd/hal/tools/Makefile index 1c4fceb34b..6cca522969 100644 --- a/usr/src/cmd/hal/tools/Makefile +++ b/usr/src/cmd/hal/tools/Makefile @@ -72,7 +72,7 @@ $(STORAGE_METHOD_PROG) := LDLIBS += -lpolkit CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTUSRSBINPROG = $(HAL_PROG:%=$(ROOTUSRSBIN)/%) \ $(SCRIPT_BIN:%=$(ROOTUSRSBIN)/%) diff --git a/usr/src/cmd/hal/tools/sunos/Makefile b/usr/src/cmd/hal/tools/sunos/Makefile index b1b3a6dc19..51b48b865b 100644 --- a/usr/src/cmd/hal/tools/sunos/Makefile +++ b/usr/src/cmd/hal/tools/sunos/Makefile @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# HAL_PROGS = hal-system-lcd-set-brightness-sunos \ hal-system-lcd-get-brightness-sunos @@ -43,7 +41,7 @@ $(HAL_PROGS) := LDLIBS += -lc $(ZIGNORE) -lglib-2.0 CPPFLAGS += $(HAL_DBUS_CPPFLAGS) $(HAL_GLIB_CPPFLAGS) $(HAL_CONFIG_CPPFLAGS) CPPFLAGS += -I$(ROOT)/usr/include/hal CPPFLAGS += -I$(ROOT)/usr/include/libpolkit -C99MODE = $(C99_ENABLE) +CSTD = $(CSTD_GNU99) ROOTCMDDIR = $(ROOTLIB_HAL)/sunos ROOTCMD = $(HAL_PROGS:%=$(ROOTCMDDIR)/%) \ |
