build: Combine CFLAGS and LIBCFLAGS.

We stopped compiling some object files twice some time ago. Since
then, all object files are build with the concatenation of both sets
of options.

The two variables are only used at this point, so it is safe to
combine them.

diff --git a/Makefile b/Makefile
index 86cdc8f5fcb7661db53911340dd6245a44f52f4b..92e66c1e4e10889a68e5ebf517f3b7aa22cedce1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,8 @@ CFLAGS += -Werror-implicit-function-declaration
 CFLAGS += -Wmissing-format-attribute
 CFLAGS += -Wunused-macros
 CFLAGS += -Wbad-function-cast
 CFLAGS += -Wmissing-format-attribute
 CFLAGS += -Wunused-macros
 CFLAGS += -Wbad-function-cast

-
-# cflags used only for building library objects
-LIBCFLAGS += -fPIC
-LIBCFLAGS += -fvisibility=hidden
+CFLAGS += -fPIC
+CFLAGS += -fvisibility=hidden

 
 libname := osl
 
 
 libname := osl
 


@@ -78,7 +76,7 @@ ifeq ($(findstring clean, $(MAKECMDGOALS)),)
 -include $(deps)
 endif
 %.o: %.c Makefile errtab.h
 -include $(deps)
 endif
 %.o: %.c Makefile errtab.h

-       $(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $(LIBCFLAGS) $<
+       $(CC) $(CPPFLAGS) -c -MMD -MF $(*F).d -MT $@ $(CFLAGS) $<

 
 fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)
 
 fsck.o: oslfsck.lsg.h
 oslfsck: $(fsck_objects)