Changes in / [6be8514:b287f67]

Location:

src/libcfa

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Tue May 31 13:24:15 2016
-## Update Count     : 141
+## Last Modified On : Tue Apr 19 22:30:17 2016
+## Update Count     : 124
 ###############################################################################
 
@@ -53 +53 @@
 CC = ${abs_top_srcdir}/src/driver/cfa
 
-headers = limits stdlib math iostream fstream iterator rational
-.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
+# extension-less header files are overridden by default make rules => explicitly override rule
+% : %.c
+        true
 
-libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
+.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${CC} ${CFLAGS} -c -o $@ $<
 
-include_HEADERS = ${headers}
+libs = limits stdlib math iostream fstream iterator rational
+libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
+
+cheaders = # expat
+cfaheaders = # limits
+include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
 
 CLEANFILES = libcfa-prelude.c

src/libcfa/Makefile.in

@@ -214 +214 @@
 MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} \
         ${addprefix ${libdir}/,${lib_LIBRARIES}} ${includedir}/*
-headers = limits stdlib math iostream fstream iterator rational
-libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
-include_HEADERS = ${headers}
+libs = limits stdlib math iostream fstream iterator rational
+libcfa_a_SOURCES = libcfa-prelude.c ${libs:=.c}
+cheaders = # expat
+cfaheaders = # limits
+include_HEADERS = ${cheaders:=.h} ${libs} ${cfaheaders}
 CLEANFILES = libcfa-prelude.c
 all: all-am
@@ -301 +303 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rational.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stdlib.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@   $(COMPILE) -c $<
 
 .c.obj:
@@ -587 +582 @@
 libcfa-prelude.o : libcfa-prelude.c
         @BACKEND_CC@ -c -o $@ $<
-.SECONDARY : ${headers}                                 # stop implicit '.o' rules from removing extensionless headers
+
+# extension-less header files are overridden by default make rules => explicitly override rule
+% : %.c
+        true
+
+.c.o : ${abs_top_srcdir}/src/driver/cfa-cpp
+        ${CC} ${CFLAGS} -c -o $@ $<
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.