[PATCH] The following patch fixes some warnings when compiling volume_id

[elogind.git] / extras / volume_id / Makefile

diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 6a3d2866c414ff7f325de3756668f4d060fc41b6..efec58f80efb9286ccffbf4418bdf4a51de594be 100644 (file)
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -1,6 +1,6 @@
 # Makefile for udev_volume_id
 #
 # Makefile for udev_volume_id
 #

-# Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+# Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>

 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -28,14 +28,21 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 INSTALL_DATA  = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 

-override CFLAGS+=-Wall -fno-builtin
-OBJS = volume_id.o udev_volume_id.o
-HEADERS = volume_id.h
+override CFLAGS+=-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
+VOLUME_ID_BASE=volume_id
+include $(VOLUME_ID_BASE)/Makefile.inc
+
+OBJS = udev_volume_id.o $(VOLUME_ID_OBJS) $(SYSFS)
+HEADERS = $(VOLUME_ID_HEADERS)

 
 $(OBJS): $(HEADERS)
 
 
 $(OBJS): $(HEADERS)
 

+.c.o:
+       $(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+

 $(PROG): $(OBJS) $(HEADERS)
 $(PROG): $(OBJS) $(HEADERS)

-       $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(CRT0) $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)

 
 clean:
        rm -f $(PROG) $(OBJS)
 
 clean:
        rm -f $(PROG) $(OBJS)


@@ -43,8 +50,7 @@ clean:
 spotless: clean
 
 install: all
 spotless: clean
 
 install: all

-       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(usrsbindir)/$(PROG)
+       $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)

 
 uninstall:
 
 uninstall:

-       - rm $(DESTDIR)$(usrsbindir)/$(PROG)
-
+       - rm $(DESTDIR)$(sbindir)/$(PROG)