summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile102
-rw-r--r--ccdv.c387
-rw-r--r--extras/ata_id/Makefile17
-rw-r--r--extras/cdrom_id/Makefile15
-rw-r--r--extras/dasd_id/Makefile15
-rw-r--r--extras/edd_id/Makefile15
-rw-r--r--extras/firmware/Makefile15
-rw-r--r--extras/floppy/Makefile15
-rw-r--r--extras/run_directory/Makefile15
-rw-r--r--extras/scsi_id/Makefile36
-rw-r--r--extras/usb_id/Makefile15
-rw-r--r--extras/volume_id/Makefile19
-rw-r--r--extras/volume_id/libvolume_id/Makefile14
13 files changed, 168 insertions, 512 deletions
diff --git a/Makefile b/Makefile
index db8ecdacc6..f650233cee 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ USE_STATIC = false
EXTRAS =
# make the build silent.
-V = false
+V =
PROGRAMS = \
udev \
@@ -148,7 +148,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
KLCC = /usr/bin/$(CROSS_COMPILE)klcc
CC = $(KLCC)
LD = $(KLCC)
- V = true
endif
ifeq ($(strip $(USE_SELINUX)),true)
@@ -162,17 +161,17 @@ ifeq ($(strip $(USE_STATIC)),true)
LDFLAGS += -static
endif
-ifeq ($(strip $(V)),false)
- QUIET=@$(PWD)/ccdv
- HOST_PROGS=ccdv
+ifeq ($(strip $(V)),)
+ E = @echo
+ Q = @
else
- QUIET=
- HOST_PROGS=
+ E = @\#
+ Q =
endif
+export E Q
all: $(PROGRAMS) $(MAN_PAGES)
- @extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
+ $(Q) extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) CC="$(CC)" \
CFLAGS="$(CFLAGS)" \
LD="$(LD)" \
@@ -180,7 +179,6 @@ all: $(PROGRAMS) $(MAN_PAGES)
STRIPCMD="$(STRIPCMD)" \
LIB_OBJS="$(LIB_OBJS)" \
LIBUDEV="$(PWD)/$(LIBUDEV)" \
- QUIET="$(QUIET)" \
-C $$target $@ || exit 1; \
done;
.PHONY: all
@@ -190,49 +188,54 @@ all: $(PROGRAMS) $(MAN_PAGES)
.SUFFIXES:
# build the objects
-%.o: %.c $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+%.o: %.c $(HEADERS) $(GEN_HEADERS)
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
# "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
- $(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
+$(PROGRAMS): %: $(HEADERS) $(GEN_HEADERS) $(LIBUDEV) %.o
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(STRIPCMD),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
-$(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
- @rm -f $@
- $(QUIET) $(AR) cq $@ $(UDEV_OBJS)
- $(QUIET) $(RANLIB) $@
+$(LIBUDEV): $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
+ $(Q) rm -f $@
+ $(E) " AR " $@
+ $(Q) $(AR) cq $@ $(UDEV_OBJS)
+ $(E) " RANLIB " $@
+ $(Q) $(RANLIB) $@
udev_version.h:
- @echo "/* Generated by make. */" > $@
- @echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
- @echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
- @echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
- @echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
+ $(E) " GENHDR " $@
+ $(Q) echo "/* Generated by make. */" > $@
+ $(Q) echo \#define UDEV_VERSION \"$(VERSION)\" >> $@
+ $(Q) echo \#define UDEV_ROOT \"$(udevdir)\" >> $@
+ $(Q) echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
+ $(Q) echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
# man pages
%.8 %.7: docs/%.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
-ccdv: ccdv.c
- @$(HOSTCC) -O1 ccdv.c -o ccdv
-.SILENT: ccdv
-
clean:
- - rm -f $(HOST_PROGS)
- - find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print0 | xargs -0rt rm -f
- - find -name "*.gcno" -print0 | xargs -0rt rm -f
- - find -name "*.gcda" -print0 | xargs -0rt rm -f
- - find -name "*.gcov" -print0 | xargs -0rt rm -f
- - rm -f udev_gcov.txt
- - rm -f core $(PROGRAMS) $(GEN_HEADERS)
- - rm -f udev-$(VERSION).tar.gz
- - rm -f udev-$(VERSION).tar.bz2
- @extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
+ $(E) " CLEAN "
+ $(Q) - find . -type f -name '*.orig' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.rej' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*~' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name '*.[oas]' -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name "*.gcno" -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name "*.gcda" -print0 | xargs -0r rm -f
+ $(Q) - find . -type f -name "*.gcov" -print0 | xargs -0r rm -f
+ $(Q) - rm -f udev_gcov.txt
+ $(Q) - rm -f core $(PROGRAMS) $(GEN_HEADERS)
+ $(Q) - rm -f udev-$(VERSION).tar.gz
+ $(Q) - rm -f udev-$(VERSION).tar.bz2
+ @ extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: clean
@@ -244,16 +247,15 @@ release:
install-config:
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
- @if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
+ @ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
$(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
fi
- @if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
+ @ if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
echo; \
echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
echo; \
fi
- @extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
+ @ extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: install-config
@@ -266,7 +268,6 @@ install-man:
$(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8
- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
@extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
$(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: install-man
@@ -278,8 +279,7 @@ uninstall-man:
- rm -f $(DESTDIR)$(mandir)/man8/udevd.8
- rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8
- rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
- @extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
+ @ extras="$(EXTRAS)"; for target in $$extras; do \
$(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: uninstall-man
@@ -292,7 +292,6 @@ install-bin:
$(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo
$(INSTALL_PROGRAM) -D udevtest $(DESTDIR)$(usrbindir)/udevtest
@extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
$(MAKE) -C $$target $@ || exit 1; \
done;
ifndef DESTDIR
@@ -313,7 +312,6 @@ ifndef DESTDIR
- rm -rf /dev/.udev
endif
@extras="$(EXTRAS)"; for target in $$extras; do \
- echo $$target; \
$(MAKE) -C $$target $@ || exit 1; \
done;
.PHONY: uninstall-bin
@@ -346,9 +344,9 @@ ChangeLog: Makefile
gcov-all:
$(MAKE) clean all STRIPCMD= USE_GCOV=true
- @echo
- @echo "binaries built with gcov support."
- @echo "run the tests and analyze with 'make udev_gcov.txt'"
+ @ echo
+ @ echo "binaries built with gcov support."
+ @ echo "run the tests and analyze with 'make udev_gcov.txt'"
.PHONY: gcov-all
# see docs/README-gcov_for_udev
diff --git a/ccdv.c b/ccdv.c
deleted file mode 100644
index e3ae9da91a..0000000000
--- a/ccdv.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/* ccdv.c
- *
- * Copyright (C) 2002-2003, by Mike Gleason, NcFTP Software.
- * All Rights Reserved.
- *
- * Licensed under the GNU Public License.
- */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#define SETCOLOR_SUCCESS (gANSIEscapes ? "\033\1331;32m" : "")
-#define SETCOLOR_FAILURE (gANSIEscapes ? "\033\1331;31m" : "")
-#define SETCOLOR_WARNING (gANSIEscapes ? "\033\1331;33m" : "")
-#define SETCOLOR_NORMAL (gANSIEscapes ? "\033\1330;39m" : "")
-
-#define TEXT_BLOCK_SIZE 8192
-#define INDENT 2
-
-#define TERMS "vt100:vt102:vt220:vt320:xterm:xterm-color:ansi:linux:scoterm:scoansi:dtterm:cons25:cygwin"
-
-size_t gNBufUsed = 0, gNBufAllocated = 0;
-char *gBuf = NULL;
-int gCCPID;
-char gAction[200] = "";
-char gTarget[200] = "";
-char gAr[32] = "";
-char gArLibraryTarget[64] = "";
-int gDumpCmdArgs = 0;
-char gArgsStr[1000];
-int gColumns = 80;
-int gANSIEscapes = 0;
-int gExitStatus = 95;
-
-static void DumpFormattedOutput(void)
-{
- char *cp;
- char spaces[8 + 1] = " ";
- char *saved;
- int curcol;
- int i;
-
- curcol = 0;
- saved = NULL;
- for (cp = gBuf + ((gDumpCmdArgs == 0) ? strlen(gArgsStr) : 0); ; cp++) {
- if (*cp == '\0') {
- if (saved != NULL) {
- cp = saved;
- saved = NULL;
- } else break;
- }
- if (*cp == '\r')
- continue;
- if (*cp == '\t') {
- saved = cp + 1;
- cp = spaces + 8 - (8 - ((curcol - INDENT - 1) % 8));
- }
- if (curcol == 0) {
- for (i = INDENT; --i >= 0; )
- putchar(' ');
- curcol = INDENT;
- }
- putchar(*cp);
- if (++curcol == (gColumns - 1)) {
- putchar('\n');
- curcol = 0;
- } else if (*cp == '\n')
- curcol = 0;
- }
- free(gBuf);
-} /* DumpFormattedOutput */
-
-
-
-/* Difftime(), only for timeval structures. */
-static void TimeValSubtract(struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
-{
- tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
- tdiff->tv_usec = t1->tv_usec - t0->tv_usec;
- if (tdiff->tv_usec < 0) {
- tdiff->tv_sec--;
- tdiff->tv_usec += 1000000;
- }
-} /* TimeValSubtract */
-
-
-
-static void Wait(void)
-{
- int pid2, status;
-
- do {
- status = 0;
- pid2 = (int) waitpid(gCCPID, &status, 0);
- } while (((pid2 >= 0) && (! WIFEXITED(status))) || ((pid2 < 0) && (errno == EINTR)));
- if (WIFEXITED(status))
- gExitStatus = WEXITSTATUS(status);
-} /* Wait */
-
-
-
-static int SlurpProgress(int fd)
-{
- char s1[71];
- char *newbuf;
- int nready;
- size_t ntoread;
- ssize_t nread;
- struct timeval now, tnext, tleft;
- fd_set ss;
- fd_set ss2;
- const char *trail = "/-\\|", *trailcp;
-
- trailcp = trail;
- snprintf(s1, sizeof(s1), "%s%s%s... ", gAction, gTarget[0] ? " " : "", gTarget);
- printf("\r%-70s%-9s", s1, "");
- fflush(stdout);
-
- gettimeofday(&now, NULL);
- tnext = now;
- tnext.tv_sec++;
- tleft.tv_sec = 1;
- tleft.tv_usec = 0;
- FD_ZERO(&ss2);
- FD_SET(fd, &ss2);
- for(;;) {
- if (gNBufUsed == (gNBufAllocated - 1)) {
- if ((newbuf = (char *) realloc(gBuf, gNBufAllocated + TEXT_BLOCK_SIZE)) == NULL) {
- perror("ccdv: realloc");
- return (-1);
- }
- gNBufAllocated += TEXT_BLOCK_SIZE;
- gBuf = newbuf;
- }
- for (;;) {
- ss = ss2;
- nready = select(fd + 1, &ss, NULL, NULL, &tleft);
- if (nready == 1)
- break;
- if (nready < 0) {
- if (errno != EINTR) {
- perror("ccdv: select");
- return (-1);
- }
- continue;
- }
- gettimeofday(&now, NULL);
- if ((now.tv_sec > tnext.tv_sec) || ((now.tv_sec == tnext.tv_sec) && (now.tv_usec >= tnext.tv_usec))) {
- tnext = now;
- tnext.tv_sec++;
- tleft.tv_sec = 1;
- tleft.tv_usec = 0;
- printf("\r%-71s%c%-7s", s1, *trailcp, "");
- fflush(stdout);
- if (*++trailcp == '\0')
- trailcp = trail;
- } else {
- TimeValSubtract(&tleft, &tnext, &now);
- }
- }
- ntoread = (gNBufAllocated - gNBufUsed - 1);
- nread = read(fd, gBuf + gNBufUsed, ntoread);
- if (nread < 0) {
- if (errno == EINTR)
- continue;
- perror("ccdv: read");
- return (-1);
- } else if (nread == 0) {
- break;
- }
- gNBufUsed += nread;
- gBuf[gNBufUsed] = '\0';
- }
- snprintf(s1, sizeof(s1), "%s%s%s: ", gAction, gTarget[0] ? " " : "", gTarget);
- Wait();
- if (gExitStatus == 0) {
- printf("\r%-70s", s1);
- printf("[%s%s%s]", ((gNBufUsed - strlen(gArgsStr)) < 4) ? SETCOLOR_SUCCESS : SETCOLOR_WARNING, "OK", SETCOLOR_NORMAL);
- printf("%-5s\n", " ");
- } else {
- printf("\r%-70s", s1);
- printf("[%s%s%s]", SETCOLOR_FAILURE, "ERROR", SETCOLOR_NORMAL);
- printf("%-2s\n", " ");
- gDumpCmdArgs = 1; /* print cmd when there are errors */
- }
- fflush(stdout);
- return (0);
-} /* SlurpProgress */
-
-
-
-static int SlurpAll(int fd)
-{
- char *newbuf;
- size_t ntoread;
- ssize_t nread;
-
- printf("%s%s%s.\n", gAction, gTarget[0] ? " " : "", gTarget);
- fflush(stdout);
-
- for(;;) {
- if (gNBufUsed == (gNBufAllocated - 1)) {
- if ((newbuf = (char *) realloc(gBuf, gNBufAllocated + TEXT_BLOCK_SIZE)) == NULL) {
- perror("ccdv: realloc");
- return (-1);
- }
- gNBufAllocated += TEXT_BLOCK_SIZE;
- gBuf = newbuf;
- }
- ntoread = (gNBufAllocated - gNBufUsed - 1);
- nread = read(fd, gBuf + gNBufUsed, ntoread);
- if (nread < 0) {
- if (errno == EINTR)
- continue;
- perror("ccdv: read");
- return (-1);
- } else if (nread == 0) {
- break;
- }
- gNBufUsed += nread;
- gBuf[gNBufUsed] = '\0';
- }
- Wait();
- gDumpCmdArgs = (gExitStatus != 0); /* print cmd when there are errors */
- return (0);
-} /* SlurpAll */
-
-
-
-static const char *Basename(const char *path)
-{
- const char *cp;
- cp = strrchr(path, '/');
- if (cp == NULL)
- return (path);
- return (cp + 1);
-} /* Basename */
-
-
-
-static const char * Extension(const char *path)
-{
- const char *cp = path;
- cp = strrchr(path, '.');
- if (cp == NULL)
- return ("");
- // printf("Extension='%s'\n", cp);
- return (cp);
-} /* Extension */
-
-
-
-static void Usage(void)
-{
- fprintf(stderr, "Usage: ccdv /path/to/cc CFLAGS...\n\n");
- fprintf(stderr, "I wrote this to reduce the deluge Make output to make finding actual problems\n");
- fprintf(stderr, "easier. It is intended to be invoked from Makefiles, like this. Instead of:\n\n");
- fprintf(stderr, "\t.c.o:\n");
- fprintf(stderr, "\t\t$(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $< -c\n");
- fprintf(stderr, "\nRewrite your rule so it looks like:\n\n");
- fprintf(stderr, "\t.c.o:\n");
- fprintf(stderr, "\t\t@ccdv $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $< -c\n\n");
- fprintf(stderr, "ccdv 1.1.0 is Free under the GNU Public License. Enjoy!\n");
- fprintf(stderr, " -- Mike Gleason, NcFTP Software <http://www.ncftp.com>\n");
- exit(96);
-} /* Usage */
-
-
-
-int main(int argc, char **argv)
-{
- int pipe1[2];
- int devnull;
- char emerg[256];
- int fd;
- int nread;
- int i;
- int cc = 0, pch = 0;
- const char *quote;
-
- if (argc < 2)
- Usage();
-
- snprintf(gAction, sizeof(gAction), "Running %s", Basename(argv[1]));
- memset(gArgsStr, 0, sizeof(gArgsStr));
- for (i = 1; i < argc; i++) {
- // printf("argv[%d]='%s'\n", i, argv[i]);
- quote = (strchr(argv[i], ' ') != NULL) ? "\"" : "";
- snprintf(gArgsStr + strlen(gArgsStr), sizeof(gArgsStr) - strlen(gArgsStr), "%s%s%s%s%s", (i == 1) ? "" : " ", quote, argv[i], quote, (i == (argc - 1)) ? "\n" : "");
- if ((strcmp(argv[i], "-o") == 0) && ((i + 1) < argc)) {
- if (strcasecmp(Extension(argv[i + 1]), ".o") != 0) {
- strcpy(gAction, "Linking");
- snprintf(gTarget, sizeof(gTarget), "%s", Basename(argv[i + 1]));
- }
- } else if (strchr("-+", (int) argv[i][0]) != NULL) {
- continue;
- } else if (strncasecmp(Extension(argv[i]), ".c", 2) == 0) {
- cc++;
- snprintf(gTarget, sizeof(gTarget), "%s", Basename(argv[i]));
- // printf("gTarget='%s'\n", gTarget);
- } else if ((strncasecmp(Extension(argv[i]), ".h", 2) == 0) && (cc == 0)) {
- pch++;
- snprintf(gTarget, sizeof(gTarget), "%s", Basename(argv[i]));
- } else if ((i == 1) && (strcmp(Basename(argv[i]), "ar") == 0)) {
- snprintf(gAr, sizeof(gAr), "%s", Basename(argv[i]));
- } else if ((gArLibraryTarget[0] == '\0') && (strcasecmp(Extension(argv[i]), ".a") == 0)) {
- snprintf(gArLibraryTarget, sizeof(gArLibraryTarget), "%s", Basename(argv[i]));
- }
- }
- if ((gAr[0] != '\0') && (gArLibraryTarget[0] != '\0')) {
- strcpy(gAction, "Creating library");
- snprintf(gTarget, sizeof(gTarget), "%s", gArLibraryTarget);
- } else if (pch > 0) {
- strcpy(gAction, "Precompiling");
- } else if (cc > 0) {
- strcpy(gAction, "Compiling");
- }
-
- if (pipe(pipe1) < 0) {
- perror("ccdv: pipe");
- exit(97);
- }
-
- (void) close(0);
- devnull = open("/dev/null", O_RDWR, 00666);
- if ((devnull != 0) && (dup2(devnull, 0) == 0))
- close(devnull);
-
- gCCPID = (int) fork();
- if (gCCPID < 0) {
- (void) close(pipe1[0]);
- (void) close(pipe1[1]);
- perror("ccdv: fork");
- exit(98);
- } else if (gCCPID == 0) {
- /* Child */
- (void) close(pipe1[0]); /* close read end */
- if (pipe1[1] != 1) { /* use write end on stdout */
- (void) dup2(pipe1[1], 1);
- (void) close(pipe1[1]);
- }
- (void) dup2(1, 2); /* use write end on stderr */
- execvp(argv[1], argv + 1);
- perror(argv[1]);
- exit(99);
- }
-
- /* parent */
- (void) close(pipe1[1]); /* close write end */
- fd = pipe1[0]; /* use read end */
-
- gColumns = (getenv("COLUMNS") != NULL) ? atoi(getenv("COLUMNS")) : 80;
- gANSIEscapes = (getenv("TERM") != NULL) && (strstr(TERMS, getenv("TERM")) != NULL);
- gBuf = (char *) malloc(TEXT_BLOCK_SIZE);
- if (gBuf == NULL)
- goto panic;
- gNBufUsed = 0;
- gNBufAllocated = TEXT_BLOCK_SIZE;
- if (strlen(gArgsStr) < (gNBufAllocated - 1)) {
- strcpy(gBuf, gArgsStr);
- gNBufUsed = strlen(gArgsStr);
- }
-
- if (isatty(1)) {
- if (SlurpProgress(fd) < 0)
- goto panic;
- } else {
- if (SlurpAll(fd) < 0)
- goto panic;
- }
- DumpFormattedOutput();
- exit(gExitStatus);
-
-panic:
- gDumpCmdArgs = 1; /* print cmd when there are errors */
- DumpFormattedOutput();
- while ((nread = read(fd, emerg, (size_t) sizeof(emerg))) > 0)
- (void) write(2, emerg, (size_t) nread);
- Wait();
- exit(gExitStatus);
-} /* main */
diff --git a/extras/ata_id/Makefile b/extras/ata_id/Makefile
index 0a881fb194..9049a35787 100644
--- a/extras/ata_id/Makefile
+++ b/extras/ata_id/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(STRIPCMD),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ifneq ($(strip $(STRIPCMD)),)
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/cdrom_id/Makefile b/extras/cdrom_id/Makefile
index 9a722d52f9..59c2532d41 100644
--- a/extras/cdrom_id/Makefile
+++ b/extras/cdrom_id/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile
index 79f14a49ba..6831a9d507 100644
--- a/extras/dasd_id/Makefile
+++ b/extras/dasd_id/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/edd_id/Makefile b/extras/edd_id/Makefile
index db6afae18c..8afd8cc2fd 100644
--- a/extras/edd_id/Makefile
+++ b/extras/edd_id/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/firmware/Makefile b/extras/firmware/Makefile
index da7fe9d1a8..d6b13b20db 100644
--- a/extras/firmware/Makefile
+++ b/extras/firmware/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/floppy/Makefile b/extras/floppy/Makefile
index e23191a533..7b46a5f00c 100644
--- a/extras/floppy/Makefile
+++ b/extras/floppy/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/run_directory/Makefile b/extras/run_directory/Makefile
index 37a59597b9..0b52326a9a 100644
--- a/extras/run_directory/Makefile
+++ b/extras/run_directory/Makefile
@@ -29,21 +29,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/scsi_id/Makefile b/extras/scsi_id/Makefile
index 057594d5bf..b185998b19 100644
--- a/extras/scsi_id/Makefile
+++ b/extras/scsi_id/Makefile
@@ -28,41 +28,37 @@ INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
-# be able to run without udev
-CROSS =
-QUIET =
-CC = $(CROSS)gcc
-LD = $(CROSS)gcc
-AR = $(CROSS)ar
-STRIPCMD = $(CROSS)strip
-CFLAGS += -Wall -pipe -fno-builtin -Wstrict-prototypes -Wsign-compare -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
-LDFLAGS += -Wl
-
all: $(PROG) $(MAN_PAGES)
.PHONY: all
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
-ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ifneq ($(STRIPCMD),)
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
scsi_id_version.h:
- @echo "/* This file is auto-generated by the Makefile */" > $@
- @echo \#define SCSI_ID_VERSION \"$(SCSI_ID_VERSION)\" >> $@
- @echo \#define SCSI_ID_CONFIG_FILE \"$(etcdir)/scsi_id.config\" >> $@
+ $(E) " GENHDR " $@
+ $(Q) echo "/* Generated by make. */" > $@
+ $(Q) echo \#define SCSI_ID_VERSION \"$(SCSI_ID_VERSION)\" >> $@
+ $(Q) echo \#define SCSI_ID_CONFIG_FILE \"$(etcdir)/scsi_id.config\" >> $@
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
@@ -82,7 +78,7 @@ uninstall-man:
.PHONY: uninstall-man
install-config:
- @if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \
+ @ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \
echo $(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir); \
$(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \
fi
diff --git a/extras/usb_id/Makefile b/extras/usb_id/Makefile
index 91b4d57d76..b3c417276a 100644
--- a/extras/usb_id/Makefile
+++ b/extras/usb_id/Makefile
@@ -30,21 +30,26 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(PROG): %: $(HEADERS) %.o $(OBJS)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
.PHONY: clean
install-bin: all
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index edb5d3ac68..b72d5b11d9 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -29,25 +29,30 @@ all: $(PROG) $(MAN_PAGES)
.DEFAULT: all
%.o: %.c $(GEN_HEADERS)
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(LIBVOLUME_ID):
- $(MAKE) -C libvolume_id
+ $(Q) $(MAKE) -C libvolume_id
$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
+ $(E) " LD " $@
+ $(Q) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
- $(QUIET) $(STRIPCMD) $@
+ $(E) " STRIP " $@
+ $(Q) $(STRIPCMD) $@
endif
# man pages
%.8: %.xml
- xmlto man $?
+ $(E) " XMLTO " $@
+ $(Q) xmlto man $?
.PRECIOUS: %.8
clean:
- rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
- $(MAKE) -C libvolume_id clean
+ $(E) " CLEAN "
+ $(Q) rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+ $(Q) $(MAKE) -C libvolume_id clean
.PHONY: clean
install-bin: all
diff --git a/extras/volume_id/libvolume_id/Makefile b/extras/volume_id/libvolume_id/Makefile
index 02c24eae05..07f6662f25 100644
--- a/extras/volume_id/libvolume_id/Makefile
+++ b/extras/volume_id/libvolume_id/Makefile
@@ -53,14 +53,18 @@ all: $(LIBVOLUME_ID)
.DEFAULT: all
%.o: %.c
- $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+ $(E) " CC " $@
+ $(Q) $(CC) -c $(CFLAGS) $< -o $@
$(LIBVOLUME_ID): $(HEADERS) $(OBJS)
- @rm -f $@
- $(QUIET) $(AR) cq $@ $(OBJS)
- $(QUIET) $(RANLIB) $@
+ $(Q) rm -f $@
+ $(E) " AR " $@
+ $(Q) $(AR) cq $@ $(OBJS)
+ $(E) " RANLIB " $@
+ $(Q) $(RANLIB) $@
clean:
- rm -f $(LIBVOLUME_ID) $(OBJS)
+ $(E) " CLEAN "
+ $(Q) rm -f $(LIBVOLUME_ID) $(OBJS)
.PHONY: clean
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-27 04:32:33 +0000