Skip to content

Commit

Permalink
Merge pull request #66 from pablooliveira/fix-dist-targets
Browse files Browse the repository at this point in the history
Fix DIST targets in automake
  • Loading branch information
pablooliveira committed May 19, 2016
2 parents 0e43101 + 20e4641 commit 49fbb00
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SUBDIRS=src/ tests/ doc/
ACLOCAL_AMFLAGS=-I m4
bin_SCRIPTS=cere
EXTRA_DIST=examples/
dist_bin_SCRIPTS=cere
3 changes: 1 addition & 2 deletions src/RegionDump/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ libcere_regiondump_la_CXXFLAGS = $(LLVMCXXFLAGS)


lib_LTLIBRARIES = libcere_regiondump.la
libcere_regiondump_la_SOURCES = RegionDump.cpp LoopRegionDump.cpp OmpRegionDump.cpp
libcere_regiondump_la_LDFLAGS =
libcere_regiondump_la_SOURCES = RegionDump.cpp LoopRegionDump.cpp OmpRegionDump.cpp RegionDump.h
3 changes: 1 addition & 2 deletions src/RegionInstrumentation/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ libcere_regioninstrumentation_la_CXXFLAGS = $(LLVMCXXFLAGS)


lib_LTLIBRARIES = libcere_regioninstrumentation.la
libcere_regioninstrumentation_la_SOURCES = RegionInstrumentation.cpp LoopRegionInstrumentation.cpp OmpRegionInstrumentation.cpp
libcere_regioninstrumentation_la_LDFLAGS =
libcere_regioninstrumentation_la_SOURCES = RegionInstrumentation.cpp LoopRegionInstrumentation.cpp OmpRegionInstrumentation.cpp RegionInstrumentation.h
3 changes: 1 addition & 2 deletions src/RegionOutliner/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ libcere_regionoutliner_la_CXXFLAGS = $(LLVMCXXFLAGS)


lib_LTLIBRARIES = libcere_regionoutliner.la
libcere_regionoutliner_la_SOURCES = RegionExtractor.cpp LoopRegionOutliner.cpp OmpRegionOutliner.cpp
libcere_regionoutliner_la_LDFLAGS =
libcere_regionoutliner_la_SOURCES = RegionExtractor.cpp LoopRegionOutliner.cpp OmpRegionOutliner.cpp RegionExtractor.h
3 changes: 1 addition & 2 deletions src/RegionReplay/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ libcere_regionreplay_la_CXXFLAGS = $(LLVMCXXFLAGS)


lib_LTLIBRARIES = libcere_regionreplay.la
libcere_regionreplay_la_SOURCES = RegionReplay.cpp LoopRegionReplay.cpp OmpRegionReplay.cpp
libcere_regionreplay_la_LDFLAGS =
libcere_regionreplay_la_SOURCES = RegionReplay.cpp LoopRegionReplay.cpp OmpRegionReplay.cpp RegionReplay.h
4 changes: 2 additions & 2 deletions src/io_detector/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lib_LTLIBRARIES = libcere_iodetector.la
libcere_iodetector_la_CFLAGS = --std=gnu99 -I ../ccan/
libcere_iodetector_la_SOURCES = io_detector.c io_detection_wrapper.c
libcere_iodetector_la_LIBADD = ../ccan/libccan.la
libcere_iodetector_la_SOURCES = io_detector.c io_detection_wrapper.c io_detector.h
libcere_iodetector_la_LIBADD = ../ccan/libccan.la
8 changes: 6 additions & 2 deletions src/memory_dump/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
lib_LTLIBRARIES = libcere_dump.la libcere_load.la
libcere_dump_la_CFLAGS = --std=gnu99 -I ../ccan/ -Wl,-z,now,-z,relro
libcere_dump_la_SOURCES = hooks.c dump.c counters.c
libcere_dump_la_SOURCES = hooks.c dump.c counters.c counters.h dump.h pages.h
libcere_dump_la_LIBADD = ../ccan/libccan.la


libcere_load_la_CFLAGS = --std=gnu99 -Wl,-z,now,-z,relro
libcere_load_la_SOURCES = replay.c
libcere_load_la_SOURCES = replay.c pages.h



2 changes: 1 addition & 1 deletion src/rdtsc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lib_LTLIBRARIES = libcere_rdtsc.la
libcere_rdtsc_la_CFLAGS = --std=gnu99 -I ../ccan/
libcere_rdtsc_la_SOURCES = rdtsc.c rdtsc_wrapper.c
libcere_rdtsc_la_SOURCES = rdtsc.c rdtsc_wrapper.c rdtsc.h
libcere_rdtsc_la_LIBADD = ../ccan/libccan.la

0 comments on commit 49fbb00

Please sign in to comment.