PERFORCE change 113291 for review

Todd Miller millert at FreeBSD.org
Sun Jan 21 22:43:20 UTC 2007


http://perforce.freebsd.org/chv.cgi?CH=113291

Change 113291 by millert at millert_macbook on 2007/01/21 22:38:38

	Fix building on non-MAC system

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/launchd/src/Makefile#4 (text+ko) ====

@@ -71,7 +71,7 @@
 am__include = include
 am__quote = 
 install_sh = install
-AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -Wpadded -Werror -fconstant-cfstrings
+AM_CFLAGS = -no-cpp-precomp -F/System/Library/PrivateFrameworks -Wall -W -Wshadow -Werror -fconstant-cfstrings
 
 sbin_SCRIPTS = service
 
@@ -137,7 +137,7 @@
 	StartupItemContext$(EXEEXT) launchproxy$(EXEEXT)
 sbin_PROGRAMS = launchd$(EXEEXT) SystemStarter$(EXEEXT) \
 	launchd_debugd$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) # $(libexec_PROGRAMS) $(sbin_PROGRAMS)
+PROGRAMS = $(sbin_PROGRAMS) # $(bin_PROGRAMS) $(libexec_PROGRAMS)
 
 ConsoleMessage_SOURCES = ConsoleMessage.c
 ConsoleMessage_OBJECTS = ConsoleMessage.$(OBJEXT)
@@ -189,11 +189,10 @@
 
 
 DEFS = -DHAVE_CONFIG_H
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(EXPORT_USR_INCLUDE)
 CPPFLAGS = 
 LDFLAGS = 
 LIBS = 
-depcomp = $(SHELL) $(top_srcdir)/depcomp
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -368,124 +367,99 @@
 
 .c.o:
 	source='$<' object='$@' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
 	source='$<' object='$@' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(COMPILE) -c `cygpath -w $<`
 
 liblaunch_profile_a-liblaunch.o: liblaunch.c
 	source='liblaunch.c' object='liblaunch_profile_a-liblaunch.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblaunch_profile_a_CFLAGS) $(CFLAGS) -c -o liblaunch_profile_a-liblaunch.o `test -f 'liblaunch.c' || echo '$(srcdir)/'`liblaunch.c
 
 liblaunch_profile_a-liblaunch.obj: liblaunch.c
 	source='liblaunch.c' object='liblaunch_profile_a-liblaunch.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblaunch_profile_a_CFLAGS) $(CFLAGS) -c -o liblaunch_profile_a-liblaunch.obj `cygpath -w liblaunch.c`
 
 SystemStarter-StartupItems.o: StartupItems.c
 	source='StartupItems.c' object='SystemStarter-StartupItems.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-StartupItems.o `test -f 'StartupItems.c' || echo '$(srcdir)/'`StartupItems.c
 
 SystemStarter-StartupItems.obj: StartupItems.c
 	source='StartupItems.c' object='SystemStarter-StartupItems.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-StartupItems.obj `cygpath -w StartupItems.c`
 
 SystemStarter-IPC.o: IPC.c
 	source='IPC.c' object='SystemStarter-IPC.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-IPC.o `test -f 'IPC.c' || echo '$(srcdir)/'`IPC.c
 
 SystemStarter-IPC.obj: IPC.c
 	source='IPC.c' object='SystemStarter-IPC.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-IPC.obj `cygpath -w IPC.c`
 
 SystemStarter-SystemStarter.o: SystemStarter.c
 	source='SystemStarter.c' object='SystemStarter-SystemStarter.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-SystemStarter.o `test -f 'SystemStarter.c' || echo '$(srcdir)/'`SystemStarter.c
 
 SystemStarter-SystemStarter.obj: SystemStarter.c
 	source='SystemStarter.c' object='SystemStarter-SystemStarter.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SystemStarter_CFLAGS) $(CFLAGS) -c -o SystemStarter-SystemStarter.obj `cygpath -w SystemStarter.c`
 
 launchd-launchd.o: launchd.c
 	source='launchd.c' object='launchd-launchd.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd.o `test -f 'launchd.c' || echo '$(srcdir)/'`launchd.c
 
 launchd-launchd.obj: launchd.c
 	source='launchd.c' object='launchd-launchd.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-launchd.obj `cygpath -w launchd.c`
 
 launchd-init.o: init.c
 	source='init.c' object='launchd-init.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-init.o `test -f 'init.c' || echo '$(srcdir)/'`init.c
 
 launchd-init.obj: init.c
 	source='init.c' object='launchd-init.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-init.obj `cygpath -w init.c`
 
 launchd-bootstrap.o: bootstrap.c
 	source='bootstrap.c' object='launchd-bootstrap.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrap.o `test -f 'bootstrap.c' || echo '$(srcdir)/'`bootstrap.c
 
 launchd-bootstrap.obj: bootstrap.c
 	source='bootstrap.c' object='launchd-bootstrap.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrap.obj `cygpath -w bootstrap.c`
 
 launchd-lists.o: lists.c
 	source='lists.c' object='launchd-lists.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-lists.o `test -f 'lists.c' || echo '$(srcdir)/'`lists.c
 
 launchd-lists.obj: lists.c
 	source='lists.c' object='launchd-lists.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-lists.obj `cygpath -w lists.c`
 
 launchd-rpc_services.o: rpc_services.c
 	source='rpc_services.c' object='launchd-rpc_services.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-rpc_services.o `test -f 'rpc_services.c' || echo '$(srcdir)/'`rpc_services.c
 
 launchd-rpc_services.obj: rpc_services.c
 	source='rpc_services.c' object='launchd-rpc_services.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-rpc_services.obj `cygpath -w rpc_services.c`
 
 launchd-bootstrapServer.o: bootstrapServer.c
 	source='bootstrapServer.c' object='launchd-bootstrapServer.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrapServer.o `test -f 'bootstrapServer.c' || echo '$(srcdir)/'`bootstrapServer.c
 
 launchd-bootstrapServer.obj: bootstrapServer.c
 	source='bootstrapServer.c' object='launchd-bootstrapServer.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_CFLAGS) $(CFLAGS) -c -o launchd-bootstrapServer.obj `cygpath -w bootstrapServer.c`
 
 launchd_debugd-launchdebugd.o: launchdebugd.c
 	source='launchdebugd.c' object='launchd_debugd-launchdebugd.o' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_debugd_CFLAGS) $(CFLAGS) -c -o launchd_debugd-launchdebugd.o `test -f 'launchdebugd.c' || echo '$(srcdir)/'`launchdebugd.c
 
 launchd_debugd-launchdebugd.obj: launchdebugd.c
 	source='launchdebugd.c' object='launchd_debugd-launchdebugd.obj' libtool=no \
-	$(CCDEPMODE) $(depcomp) \
 	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(launchd_debugd_CFLAGS) $(CFLAGS) -c -o launchd_debugd-launchdebugd.obj `cygpath -w launchdebugd.c`
-CCDEPMODE = depmode=gcc3
 uninstall-info-am:
 
 man1dir = $(mandir)/man1


More information about the trustedbsd-cvs mailing list